git-practice

A repository for students to practice using Git/Github

Instructions for students:

Fork the repository into your own github account.
Remove the erroneous commit 0dbea28. It was a mistake! It shouldn't appear in history anymore. Hint: rebase --interactive
Remove the file delete.me from the repo
Make a file called todo.txt, add some tasks into it, and commit it.
Rebase your master branch onto matt-chan-branch-1.
Add more tasks to todo.txt and commit those too.
Go back to the original commit introducing todo.txt and make a new branch called planB. Add some tasks to the file and make a commit.
Merge the two branches back together. Fix any merge conflicts.
Make a pull request against my master branch.

tczorro/git-practice