GIT merge master into a branch
Problem
I have been developing a new feature on a new branch, and on the side have committed quite a few changes on my master branch. Is it possible to merge the master branch into my new branch to keep it up-to-date so that I won't have too many merge conflicts once the new feature is finished?
Unverified for your environment
Select your OS to check compatibility.
1 Fix
Fix for: GIT merge master into a branch
You can either or . If the branch has not been distributed to other people, in this case i would prefer git rebase. Because makes it as if the changes on the feature branch were made on top of the changes on the master branch, which makes the version graph simpler. Rebase Taking the example from the git rebase manual, in branch : However, is only suitable when nobody else is working on it, or there will be confusion and extra work for them, because the old commits A, B, C are now replaced by ne…
Awaiting Verification
Be the first to verify this fix
Sign in to verify this fix