Git merge two local branches
Sophia Terry 
I have branch Master, branchA and branchB.
Now I'm working in the branchA and I need to merge branchA with branchB and proceed my work in the branchA. All files are comitted in the branchA and branchB.
What's the fast way to implement it?
8 Answers
If I understood your question, you want to merge branchB into branchA. To do so,
first checkout branchA like below,
git checkout branchAThen execute the below command to merge branchB into branchA:
git merge branchBHere's a clear picture:
Assuming we have branch-A and branch-B
We want to merge branch-B into branch-A
on branch-B -> A: switch to branch-A
on branch-A: git merge branch-BThe answer from the Abiraman was absolutely correct. However, for newbies to git, they might forget to pull the repository. Whenever you want to do a merge from branchB into branchA. First checkout and take pull from branchB (Make sure that, your branch is updated with remote branch)
git checkout branchBgit pullNow you local branchB is updated with remote branchB Now you can checkout to branchA
git checkout branchANow you are in branchA, then you can merge with branchB using following command
git merge branchBon branchB do $git checkout branchA to switch to branch A
on branchA do $git merge branchB
That's all you need.
If you or another dev will not work on branchB further, I think it's better to keep commits in order to make reverts without headaches. So ;
git checkout branchA
git pull --rebase branchBIt's important that branchB shouldn't be used anymore.
For more ;
2For merging first branch to second one:
on first branch: git merge secondBranch
on second branch: Move to first branch-> git checkout firstBranch-> git merge secondBranch
I would recommend below one if anyone looking to fetch remote changes as well:
git pull
git merge origin/developmentIt is very simple,
you need to first checkout to branchA, for this you can use command git checkout branchA.
Now you are in branchA, just hit the merge command git merge branchB.
And you are done!!!
