merging a branch

Hi there,

I've done some work on a branch and now want to put the work back in the master and discard the branch. how do I do that?

Many thanks,


2 answers

This widget could not be displayed.

Basically you checkout your destination branch (master) and do a git merge branchname....


About "discarding a branch":

Have a look at  Git Branching - What a Branch Is. Deleting a branch is simply removing the symbolic name of the branch - all the commits done on the branch are preserved (that's one of the main purposes of a VCS: preserving old commits). If you want to get rid of all commits on the branch and want to have only one single commit (containing all changes made on the branch), there are more advanced git command (you have to do a git merge --squash ....)

Suggest an answer

Log in or Sign up to answer
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

861 views 2 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you