DevConf.CZ 2020

Git is a wonderful tool. However, many people don't take advantage of the simplest features of it, use mainly three commands: pull, commit and push.
They memorize and then use other commands, which often ends up being painful not only for them, but everyone who works on the same project. Especially when one force pushes.
(https://xkcd.com/1597/)
This workshop will include exercises on various Git troubles, how to find them, how to fix them without any force, and how to avoid them.
It also will illustrate a couple of advanced Git topics and tools as
- interactive staging
- merging conflicts- interactive rebase
- advanced merging and strategies, etc..

Attendees: ~50