CODEWITHSUNDEEP
branchbitbucketgit-mergegit-merge-conflict
bill
bill

Reputation: 864

How to merge branch to master on bitbucket

I have following questions.

  1. I want to create a branch from my master repo. I can use either bitbucket dashboard or Terminal to create a branch. If I used Terminal, the created branch does not show in Overview.but if I used Create a branch from dashboard and create, it shows the branch but din't contains anything and asked me to do checkout with git fetch && git checkout branchname command.
    Which one is the correct way to create a branch?

  2. Then my next question is , Think my master has Changed and my Branch is also chanaged. so how can I merge my branch changes to master. what are the steps to do that. (Best way is to use commands or the bitbucket dashboard merge)

  3. Finally , if we typed git branch, it shows master and other branches. so how can I change the branch from terminal.

Upvotes: 13

Views: 81264

Answers (4)

chime
chime

Reputation: 11

You should create a remote branch with the same name as you used on your local repository. with this branch available on the remote repository

You can now do git push

Upvotes: 0

techhunter
techhunter

Reputation: 693

It can be done by using:

  1. checkout to master branch and
  2. git merge your branch.

You will find the complete guide here.

Upvotes: 2

AshMenhennett
AshMenhennett

Reputation: 1095

  1. Create a new branch from master: git checkout -b newbranch. You may need to push to make the branch available on the remote (git bucket)- git push remote master. I would do this when working on a project. Terminal would be preferable, otherwise you would 'pigeon hole' yourself into working with a specific UI, rather than a consistent CLI.

  2. Make sure your master is upto date, by commiting and pushing any changes and then merge the other branch to master. Again, I would use Terminal.

  3. git checkout otherbranch would change from any branch to otherbranch. Note that the -b flag is not passed in. This will just change the active branch.

Upvotes: 0

Tim Biegeleisen
Tim Biegeleisen

Reputation: 521239

1) When you create a branch on Bitbucket, that branch does not exist locally. This is probably why the dashboard is recommending that you do git fetch. Git fetch will bring the newly created branch into your local Git. After this, you can do a checkout via git checkout newBranch. Had you created the branch locally, the steps would have happened in reverse. Specifically, the new branch would exist in your local Git, but would not exist on the Bitbucket remote until you did a git push.

In my experience, creating a branch locally via git checkout -b is the typical way to create a branch, as usually this is being done by a developer in his local environment.

2) To merge your branch's changes to master you can try the following:

git checkout master
git merge yourBranch

Keep in mind that it you follow Bitbucket's workflow, the merge might actually be happening as part of a pull request.

3) To switch branches locally, just use git checkout <branch_name>. For example, to switch to yourBranch from master you would type:

git checkout yourBranch

Upvotes: 12

Related Questions