Neha Shettar
Neha Shettar

Reputation: 713

Merging two branch in Bitbucket

I am new to Bitbucket and Git. Please help to in merging two branches using Eclipse.

Following is the scenario:

There was one branch - A 
New branch was created from A for Tech Upgrade - B 
New Branch was created from A for New Features - C 
New Branch is now created from C - D

Now, I want to integrate all changes from B to D

What steps do I need to follow for safe merge using Eclipse.

Thanks in advance

Upvotes: 2

Views: 7006

Answers (2)

SwissCodeMen
SwissCodeMen

Reputation: 4895

  1. Check if all branches are up-to date. Otherwise you have to push the branches where are not up-to date.
  2. git checkout D
  3. After checkout command, make git merge B in branch D
  4. Now all changes from branch B are in branch D

With git branch you can see on which branch you are, and which branches are available. With git branch -a you list all remote branches.

Upvotes: 4

Monzurul Shimul
Monzurul Shimul

Reputation: 8396

Open a terminal, go to project directory and run following:

git checkout D
git merge B

Upvotes: 2

Related Questions