Git: "patch does not apply" - how to edit hunks in git add patch mode
Channel: John Kary
Date: 27/10/2012

How to edit hunks in git add's patch mode. Never fear seeing "patch does not apply" again!

Previous video: Intro to git add patch mode - http://www.youtube.com/watch?v=Wl0NfWYrvlY

I've since learned if you find yourself needing to edit the hunk numbers to make the diff apply cleaning it means you deleted an empty line, like I did in this video. Oops.

John Kary
http://twitter.com/johnkary
http://johnkary.net