https://markallison.co.uk/tags/source-control/ Recent content in Source-Control on Mark Allison https://markallison.co.uk/%3Clink%20or%20path%20of%20image%20for%20opengraph,%20twitter-cards%3E https://markallison.co.uk/%3Clink%20or%20path%20of%20image%20for%20opengraph,%20twitter-cards%3E Hugo -- 0.151.2 en Tue, 30 May 2017 18:03:09 +0000 https://markallison.co.uk/blog/git-how-to-work-on-a-feature-branch/ Tue, 30 May 2017 18:03:09 +0000 https://markallison.co.uk/blog/git-how-to-work-on-a-feature-branch/ <h2 id="how-to-work-on-a-feature-branch-but-pull-in-later-commits-from-another-branch">How to work on a feature branch but pull in later commits from another branch?</h2> <p>On a client site last week the question was raised: I want to work on a feature for a project which will take longer than other people merging their branches into the dev branch. I therefore want to merge any changes on the dev branch into mine, test my changes before pushing back to the dev branch, and then and ultimately master for a release.</p>