Archives for the tag: upstream

In Stash 2.4 we introduced support for fork-based workflows. As part of building the feature, half the Stash team switched to forks for their daily work to dogfood forks and ensure it worked. The result? Pain. Let me explain. The pain grew out of two primary shortcomings of forking: Integrating with upstream is clunky and onerous because you have to maintain 2 remotes and constantly juggle them Verifying what you've written is impossible, because continuous integration (CI) does not understand

Continue reading »

There are tons and then some useful guides on how to keep your forks updated against the upstream repositories (and if you're wondering why you would want to use forks in an enterprise setting, check out a few reasons here). In this blog I will introduce you to few aspects of how forking interacts with upstream: the basics, the gotcha's, and an cool tip. To top it off I will then make you very jealous, or very eager, the choice is yours. Interested? Read on. The base workflow to keep up-to-date

Continue reading »