Skip to content

Commit

Permalink
Added exercise for fixing mistakes
Browse files Browse the repository at this point in the history
  • Loading branch information
egotsev committed May 19, 2016
1 parent 9d50549 commit 81df7cf
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,13 @@ Okay, that was easy, eh.
6. Merge into **release-1.0** the **origin/feature34** branch. Resolve the merge conflict.
7. Push the **release-1.0** branch in the repo.

## Fixing mistakes
1. Change file and stage it. Now unstage it.
2. Unmodify the file to committed state.
3. Modify something, commit it to a new branch and push it.
4. Now amend the commit. Show in the history that the commit is in practice completely different. Push it to the repo.
5. Why can’t you push to the repo?
6. Create new branch from **master** and cherry pick the latest commit from **feature33**. Check the history now.
7. Now imagine with this commit a bug was added so it has to be reverted.
8. Checkout the **mistaken-gitignore** branch. Add to .gitignore rule to ignore .class files and remove from the latest commit all .class files.

0 comments on commit 81df7cf

Please sign in to comment.