Today I learnt about `git apply --reject`, which applies as much of a patch as it can, and leaves the remaining conflicting changes in foo.rej files:
miniblog.
Related Posts
I'm experimenting with <<<<<<< merge conflict markers in difftastic: recreate the conflicting files and then diff them.
What do you think? Merge conflicts are confusing even at the best of times, but maybe difftastic's UI can help a little.
Another great @magit_emacs feature: when rebasing, you can see progress as you work through conflicting commits. http://t.co/5Zy2rCg8IF
Pip is worryingly tolerant of conflicting version numbers: http://t.co/J3VNfeKW


