View Code? Open in Web Editor
NEW
This project forked from zonca/conversion_tofix
Exercise for Advanced git tutorial
License: The Unlicense
conversion_tofix's Introduction
- Clone this repository to Comet
- Test it running
python test_conversion.py
, does it fail?
- Checkout the code version just before the last commit, does it still fail? How do you go back to the last commit?
- I will create a new commit in my repository
- Create 2 branches, test
rebase
in one and merge
in the other
- After merge, inspect with
git log --graph --oneline
6) Synchronize upstream with conflicts
- I will create a new commit in my repository with a conflict
- Do a rebase and handle conflicts
- Use
git rebase
to completely wipe the commit from history
- Try to push
- Wipe the last commit with
git reset --hard
conversion_tofix's People
Contributors
Watchers