Skip to content

yale-stc-developer-curriculum/favorites

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

##GitHub Assignment -- Favorites

  • Divide into 6 teams; each with 5 people.
  1. Start by cloning this repository onto your computer.
  2. Pick a team name and one person should create a new branch for your team. Push the branch to origin.
  3. Other team members should pull this branch and switch to it. Now we're ready to roll.
  4. Each person on your team should create one of the following files, add their favorites of that category to the file, and save it to your branch:
  5. food.txt
  6. music.txt
  7. tv-movies.txt
  8. experiences.txt
  9. random.txt - add at least 3-4 favorites in your file - make sure these are the names of your files - files must be text-based, but feel free to include links, quotations, etc.
  10. Commit and push your changes. (Hint: You'll need to pull / merge as you go... don't try to all push at the same time.)
  11. Everybody should pull your updated branch.
  12. Now comes the fun part. Pick a different file than you were working on before and change away. Add your favorites. Delete your friend's favorites. Reorder things, duplicate things, make a little mess.
  • Once again, everybody should be working on a different file.
  1. Commit and push your changes.
  2. Repeat steps 5-7 until everyone has had a chance to make their changes to every file.
  3. Your branch should be done. Pat yourself on the back.
  4. Find another team who has also finished and merge your branch with theirs. Merge that into another team's branch.
  5. Once the class is happy with it's creation, merge the final branch to master.
  6. Admire your creation. And the magic of GitHub making it possible

About

Homework #2: Git Merging -- Tech Bootcamp 2014

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published