Gitkata rerere
- 1. rerere
Other katas NOW (13:10) Katas NEXT (14:50)
Submodules (Paweł Cesar Sanjuan Szklarz) Interactive rebase (Jakub Nabrdalik)
Pull & push options (Michał Bareja) Undoing changes (Michał Bareja)
Git internals (Mateusz Harasymczuk) Fish shell (Mateusz Grzechociński)
Git bisect (Grzegorz Kubiak) Merging and rebasing (Mateusz Harasymczuk)
Git-svn (Kamil Trzciński) Git rebase (Grzegorz Kubiak)
Rescue stash (Marcin Zajączkowski) Configs/aliases (Łukasz Siwiński)
Reset vs. revert (Marcin Zajączkowski)
Mateusz Grzechociński
$ git kata http://grzechocinski.net
- 2. $ git kata
rerere
Other katas NOW (17:20)
Submodules (Paweł Cesar Sanjuan Szklarz)
Pull & push options (Michał Bareja)
Git internals (Mateusz Harasymczuk)
Git bisect (Grzegorz Kubiak)
Git-svn (Kamil Trzciński)
Rescue stash (Marcin Zajączkowski)
Mateusz Grzechociński
http://grzechocinski.net
- 3. Shit happens...
[22:46:54] mgrzechocinski ~/d/R/gitkata
(master u+2) git merge topic/v1
Auto-merging
src/main/java/pl/gitkata/rerere/Person.java
CONFLICT (content): Merge conflict in
src/main/java/pl/gitkata/rerere/Person.java
Automatic merge failed; fix conflicts and
then commit the result.
- 7. DEMO
● "Recorded preimage for XYZ"
● git rerere status
● git rerere diff
● "Recorded resolution for XYZ"
- 8. File context
● not user
● not branch
● not revision
● not line
● FILE
- 10. Sharing resolutions?
● no mechanism
● but... symbolic links rocks!
https://github.
com/ngiordano/frameworks_bas
e/blob/master/git/rr-cache
- 11. What's the cost?
● fast, simple operations on file
● no graph traversing
● remember about git rerere gc
- 13. Next katas
Interactive rebase (Jakub Nabrdalik)
Undoing changes (Michał Bareja)
Fish shell (Mateusz Grzechociński)
Merging and rebasing (Mateusz Harasymczuk)
Git rebase (Grzegorz Kubiak)
Configs/aliases (Łukasz Siwiński)
Reset vs. revert (Marcin Zajączkowski)