CODEWITHSUNDEEP
gitmerge
user3127896
user3127896

Reputation: 6563

Git merge two local branches

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?

Upvotes: 295

Views: 433817

Answers (8)

Mahmoud Zalt
Mahmoud Zalt

Reputation: 31090

Here's a clear picture:

Assuming we have branch A and branch B and we want to merge branch B into branch A:

  1. On branch B: switch to branch A
  2. On branch A: git merge branch B

Upvotes: 176

Abimaran Kugathasan
Abimaran Kugathasan

Reputation: 32458

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

You can also condense this into one liner:

git merge branchA branchB

Upvotes: 552

Alok Gupta
Alok Gupta

Reputation: 1910

I would recommend below one if anyone looking to fetch remote changes as well:

git pull
git merge origin/development

Upvotes: -4

S.R
S.R

Reputation: 123

It 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!!!

Upvotes: -1

Himanshu Gupta
Himanshu Gupta

Reputation: 71

For 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

Upvotes: 0

Dapo Momodu
Dapo Momodu

Reputation: 329

on branchB do $git checkout branchA to switch to branch A

on branchA do $git merge branchB

That's all you need.

Upvotes: 2

user12057507
user12057507

Reputation:

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

Upvotes: 9

Erdinç Çorbacı
Erdinç Çorbacı

Reputation: 1213

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/

Upvotes: -1

Related Questions