How I Resolve Git Merge Conflicts with Rebasing (Abort!)
Watch me code and learn how to tame git merge conflicts with the CLI. Watch to the end for a special request!
====== Contents ======
00:00 Intro
01:35 Discovering Merge Conflict (GitHub)
06:45 Why Abort Rebase
07:02 Git Reset Head
10:08 Now Rebase
13:09 CI Build and Pull Request
16:30 Closing - AMA Request
