This website uses cookies so that we can provide you with the best user experience possible. Cookie information is stored in your browser and performs functions such as recognising you when you return to our website and helping our team to understand which sections of the website you find most interesting and useful.
Privacy Overview
Strictly Necessary Cookies
Strictly Necessary Cookie should be enabled at all times so that we can save your preferences for cookie settings.
If you disable this cookie, we will not be able to save your preferences. This means that every time you visit this website you will need to enable or disable cookies again.
3rd Party Cookies
This website uses Google Analytics to collect anonymous information such as the number of visitors to the site, and the most popular pages.
Keeping this cookie enabled helps us to improve our website.
Please enable Strictly Necessary Cookies first so that we can save your preferences!
Cookie Policy
More information about our Cookie Policy
2 Comments
Great topic and interesting concept on rebasing a branch to the main line rather than a traditional approach of merging a branch in.
Thanks! We are rebasing the main branch onto our private branch, then merging our private branch back into main. This way it’ll always be a fast forward commit with no conflicts when we merge. Rebasing our private branch to the master would cause a change to the master branch, something we don’t want until our feature is done… then we just merge the two.