[Step 12] Merge a pull request - Yellow-Team-Millerslab/GitPlayground GitHub Wiki

This section is more for project administrators.

To merge a pull request, you can do it on Github or you can do it locally when there are too mnay conflicts.

To do it locally, it requires to set up repo config.

1. In SourceTree, click Repository on menu, and click Repository Settings

   

2. In the popup, click Edit Config File...

   

3. Add a line like below in [remote "Origin"] section ref

   fetch = +refs/heads/*:refs/remotes/origin/pr/*

4. Click Fetch, it will show a pr branch under REMOTES \ origin

   

5. Double click the branch under pr and it will popup a modal for Checkout

   

6. In VS2017 Team Explorer, Switch back to master branch, right click on that pull request. (which is treated as a branch)

   

7. Click Merge From, from here it works just like merging a branch.

8. After merge and push out the commit, Github will close the pull request automatically