Menu
I have a branch I created which is a decendant of master.
master -> mybranch
I now need to merge in code from things/bugfix into mybranch
master -> things/bugfix
So I need things/bugfix code to be in mybranch
675
To merge branches locally, use git checkout to switch to the branch you want to merge into. This branch is typically the main branch. Next, use git merge and specify the name of the other branch to bring into this branch. This example merges the jeff/feature1 branch into the main branch.
Git merge will combine multiple sequences of commits into one unified history. In the most frequent use cases, git merge is used to combine two branches.
Select the branch that you want to merge into the current branch, click Modify options and choose from the following: --no-ff : a merge commit will be created in all cases, even if the merge could be resolved as a fast-forward. --ff-only : the merge will be resolved only if it is possible to fast-forward.
First checkout mybranch :
git checkout mybranch
Then merge things/bugfix into mybranch :
git merge things/bugfix
159
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
