Skip to content

Latest commit

 

History

History
45 lines (29 loc) · 1.45 KB

README.md

File metadata and controls

45 lines (29 loc) · 1.45 KB

conversion_tofix

1) Make a test

  • 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?

2) Bisect

3) Fix in branch

4) Create Pull Request

5) Synchronize upstream

  • 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

7) Erase commit

  • Use git rebase to completely wipe the commit from history
  • Try to push

8) Hard reset

  • Wipe the last commit with git reset --hard