| 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 a Pull Request, viewing someone else's code locally, 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 the team member sitting to your right.
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.
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.
If everything looks okay, please make a quick comment indicating that you believe the code is ready to be merged.
👮 ✋ - Please wait until everyone has caught up.
🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧
All Team Members
If you are curious to run someone else's code locally, you will need to set up a remote to their GitHub fork and grab their latest commits.
Create a remote pointing to the person to your right's Fork:
$ git remote add teammate https://github.com/teammate-username/repository-name.git
# add the teammate remote
$ git remote -v
me https://github.com/your-username/repository-name.git (fetch)
me https://github.com/your-username/repository-name.git (push)
origin https://github.com/source-username/repository-name.git (fetch)
origin https://github.com/source-username/repository-name.git (push)
teammate https://github.com/teammate-username/repository-name.git (fetch)
teammate https://github.com/teammate-username/repository-name.git (push)Fetch their commits and view their branches:
$ git fetch teammate
# fetch the latest from teammate
$ git branch -r --list teammate/*
# show all remote branches for the teammate
teammate/develop
teammate/eggs-benny-feb
teammate/masterCheckout a tracking branch:
$ git checkout eggs-benny-feb
Branch teammate-feature-branch set up to track remote branch eggs-benny-feb from teammate.
Switched to a new branch 'teammate-feature-branch'💡 As long as only one of your remotes has a branch called eggs-benny-feb, it knows to create a local tracking branch.
💡 If you do not wish to create a tracking branch, you can check out the branch in read-only mode by fully-specifying the branch instead (e.g., teammate/eggs-benny-feb)
Now you've switched the code in your directory to a branch containing all of the changes committed to your teammate's branch. If you have your project open in sublime or another text editor you will notice that the source files contain your teammate's changes.
If you run the git log command you can see a log of the latest commits made to the current branch:
$ git log
commit 6b7a7c2bc46753d0d394758b8fd04bcd3b4cf896
Author: My Teammate <teammate@gr8people.com>
Date: Mon Feb 8 12:58:20 2016 -0500
Adding Eggs Benny February Recipe
...💡 Press enter to scroll through lines & Ctrl+C to exit the log.
Once you are done, you can delete this branch:
$ git checkout develop
# switch to develop
$ git branch -d teammate-feature-branch
# delete tracking branch👮 ✋ - Please wait until everyone has caught up.
🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧
Maintainers
Open the list of open Pull Requests on GitHub and split them between all maintainers.
If there were more team members than writers, close Pull Requests for duplicate writers using the "Close pull request" button at the very bottom of the page.
For all remaining 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.
👮 ✋ - Please wait until everyone has caught up.
🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧 🚧
Next we will walk through the process of fetching the latest changes to the source repository.