Git merge two local branches

Question

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

User · Accepted Answer

If I understood your question  you want to merge branchB into branchA  To do so  first checkout branchA like below  git checkout branchA  Then execute the below command to merge branchB into branchA  git merge branchB

User · Answer

The 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 branchB   git pull   Now you local branchB is updated with remote branchB Now you can checkout to branchA  git checkout branchA   Now you are in branchA  then you can merge with branchB using following command  git merge branchB

User · Answer

on branchB do  git checkout branchA to switch to branch A   on branchA do  git merge branchB  That s all you need

User · Answer

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 branchB   It s important that branchB shouldn t be used anymore   For more   https   www derekgourlay com blog git-when-to-merge-vs-when-to-rebase

User · Answer

Here s a clear picture   Assuming we have branch-A and branch-B  We want to merge branch-B into branch-A  on branch-B - gt  A  switch to branch-A  on branch-A  git merge branch-B

User · Answer

For merging first branch to second one  on first branch  git merge secondBranch on second branch  Move to first branch- gt  git checkout firstBranch- gt  git merge secondBranch

[git] Git merge two local branches

Examples related to git

Examples related to merge