14 Nov
2016
14 Nov
'16
1:42 a.m.
Oy. I just (foolishly) did a $ git checkout dev $ git merge sydb-X when I meant the opposite: $ git checkout sydb-X $ git merge dev I haven't pushed anything, so no harm done; but I don't know how to git-undo what I just did in my local copy so I can easily move on. Any suggestions?