Most of us are using git, but many of us aren't familiar with git commands. Join me in this session and see that the git commands don't have to be black magic and learn a few new tips and tricks. You will learn how to debug git, patch your commits and resolve merge conflicts in a better way.
Git is inevitably the most often used software among software developers - and we all have been in the situation where something happened to our git tree that was not supposed to happen. Visual Git Clients can catch some of these exceptions, but clearly not all of them. And often enough, you just want to achieve something advanced that is just not possible with a GUI client.
Ever had to resolve the exact same merge conflict repeatedly? Ever wanted to reset a single file to a certain branch? Or wanted to find out which commit broke your code after a merge? The solutions to these issues will be covered in this talk, alongside with advanced git commands for Debugging Git, Inspecting your Git Tree and Patching your Commits.
Objectives
- Discuss the rising importance of mastering Git on the command line
- Present some unpopular and hidden parts of Git like Debugging
- Showcase and Explain commonly unknown git commands like
bisect - Resolving some of the most annoying problems with using git by using some tricks & hacks.
Timing
- 3 minute intro
- 5 minutes - Why learn Git on the command line?
- 15 minutes showing and explaining commonly unknown git commands including the most important Debugging, Patching and Plumbing Commands.
- 5 minutes resolving some common yet really annoying git issues
- Remaining time on where to learn more + Q&A