Skip to Content

Merging branches back into master branch in GitHub using Pull Requests

Previous

Merging branches back into master branch in GitHub using Pull Requests

By SathyaBhat

Part 6 of 6, Collaborative Development Using GitHub and SAP Web IDE

You will learn

In this tutorial, you’ll learn how to create and send pull requests so that the changes in branches will be merged into the master branch

Details


  1. Open the Organization repository on GitHub and switch to the branch which you want to merge into master.

  2. Click on the New Pull Request button to create a Pull Request.

    Create pull request
  3. Enter brief details about the Pull Request and click on Create pull request button to create a request. You can scroll down and see a diff of the files which were changed as well as the commits done.

    Open pull request
  4. To accept the pull request click on the Pull Requests tab to see a summary of pull requests pending. If you are happy with the changes click on the Merge Pull request button to accept the pull request and perform the merge. You can add in a comment if you desire so.

    Merge pull request
  5. Once you click on Merge Pull request, you will see a button Confirm merge. Clicking on the drop-down besides the button allows you to select a merge option of your choice - select Squash merge if you want a single commit of all changes or merge commit if you want all commits from the other branch.

    Confirm merge
  6. If the merge was successful, you’ll see a note about it and you can proceed with deleting the branch if required.

    Merge successful
  7. You will notice that the issues are automatically closed as well and the milestone is complete.

    GitHub will automatically close an issue if your commit message includes certain keywords once this change is merged into the master branch.

    Milestone complete
  8. Ensure your workspace in SAP Web IDE has fetched these latest changes. To do this

    a. Click on the Git pane on the right hand side and then switch over to the master branch.

    Switch to master

    b. Click on the Pull button to pull in the changes. Enter your GitHub account credentials and press OK button.

    Switch to master

    c. Click on the Git history button on the right hand side to see that the branching, changes and pull request was successful.

    Switch to master

Next Steps

Updated 12/08/2016

Time to Complete

10 Min.

Intermediate

Next Steps

Next
Back to top