On Sun, Nov 27, 2016 at 08:46:40AM -0500, Dun Peal wrote: > Ignoring a non-zero exit code from the merge tool, and assuming a > successful merge in that case, seems like the wrong default behavior > to me. Yeah, I'm inclined to agree. But like I said, I'm not too familiar with this area, so maybe there are subtle things I'm missing. > Finally, if you're not using mergetools, how do you resolve conflicts? I just edit the conflicted sections in vim. I do use git-jump (see contrib/git-jump), but that's just to get to them quickly. -Peff