| Date | Phase |
|---|---|
| February 2nd | Development |
Now that all of the mods for the next release have been made, it is time to review and get code merged.
Follow along with the activities below to walk through the process of reviewing and merging a Pull Request.
All Team Members
Navigate to the source repository on GitHub, click the "Pull Requests" tab, and click on the Pull Request opened by your team mate.
Review the following things:
- Verify that the user is requesting to merge their feature branch into the
developbranch. - Check to see if there is any important information on the Conversation tab.
- Check the Commits tab to get a high-level view of the individual changes that were made.
- Verify that the changes on the Files Changed tab look correct to you.
- Do the commit messages clearly describe what was committed?
If anything looks wrong, please make a quick comment outlining the issue. If there is a specific line of code, you can comment directly on the line from the Files Changed tab.
In a real-world scenario the author of the changes would go back and make amendments based on the feedback, but for the purposes of this exercise we'll just take the feedback as a lesson what we can do better in future.
If the user is merging into the correct branch make a quick comment indicating that you believe the code is ready to be merged.
Open each Pull Requests and click the green "Merge pull request" button. Assuming there are no merge conflicts, GitHub will automatically merge the code into the develop branch. If there are merge conflicts, for this exercise, close the pull request using the "Close pull request" button at the bottom.
In practice, merge conflicts should be corrected by the team member requesting to merge changes. Sometimes this is not feasible and a maintainer may have to merge the changes manually.
Next we will walk through the process of fetching the latest changes locally.