Sourcetree (OSX): workflow for merging github pull requests

Question

I am using Sourcetree to manage a repository on github.

I recently received a pull-request for relative to such github repository. Ideally I would like to:

* configure Sourcetree to receive notifications of github pull requests in the application
* checkout the pull request in my local repository to inspect the changes, run tests ecc ecc
* accept the pull request (i.e. merge and push to the github repository)

I am not sure if point 1. is supported right now but I am sure the rest can be done in Sourcetree without resorting to command-line git.

Can you please help me out with the relevant steps that have to performed to achieve points 2. and 3. ?

Thank you

Stefano

Balázs Szakmáry · Answer

(These instructions are for windows, but it should be exactly the same for OSX with the equivalent actions for double click and right click.)

* Not supported.
* For looking at the Diff and making comments, your best option is the GitHub web interface. To view/compile/run the code on your computer, you need to checkout the source branch of the pull request:* Fetch.
* In the Remotes section, open the origin node, locate the source branch of the PR and double click it to checkout that branch. If you get a dialog, just press OK without changing anything.
* Now you can compile, run, etc.

* * Check out the target branch, like above.
* Right-click the name of the source branch, select "Merge <source> into current branch.* If there are merge conflicts, resolve them and commit the changes without editing the contents of the stage in the commit dialog.
* If there are no conflicts, the merge commit will be created automatically.

* Push the merge commit (the target branch).