CS 2401 Git/GitHub Lab

Prepared by: Nasseef Abukamail ([email protected])

February 2020

Thanks to Tim Steinberger, Kristen Masada, and Daniel Abdelsamed for their valuable input.

---

You must complete the first lab prior to attempting this one. If you don't have a GitHub account, visit GitHub for Students to sign up. Make sure you use your school email to get the student's benefits.

---

Credentials

Make sure you configure your user name and email in git. Your credentials will be used in git history. Verify your user name and email by issuing the command git config --list. If your name and email are not shown in the list, execute the following commands to configure them.

git config --global user.name "Enter your name here"
git config --global user.email "Enter your school email here"

---

Steps to Complete

1. Conflicts
2. Undoing Changes
3. Branching and Pull Requests
   • Branching
   • Pull Requests

---

Workflow Summary:

• Create a repository for every project
• Create a branch for every feature
• Create a pull request for the feature's branch
• Have your team review the pull request and comment on it
  • At this point the feature can be accepted, rejected, or recommended for modification
• Have a team member (other than the author) merge the pull request

That's it. You just experienced the most common development workflow used today.

---

4. Submission

   Submit a link to your shared repository on GitHub.