Merge branch to another branch

[Steve Armstrong]

I have a repository that I've been given access to through Github.  It has number of branches.  The client said I needed to create a branch from the master (which I did), make my updates and then merge them into the 'Staging' branch.  I'm confused on how to merge my newly created branch into an existing one with SourceTree.  Can anyone help?

[Jeff Thomas]

Hi Steve,

If you want to merge your branch into 'staging' locally, you can do the follow:

1. Right-click on the Staging branch and select "Checkout Staging"
2. Right-click on your branch and select "Merge your-branch into Staging"

This will perform the merge and you can push Staging up to Github with your changes.

Alternatively, you may look at pushing your branch directly to Github and opening a pull request from your branch into staging and then another one for staging into master.