Yeah, another hightlight from HN. This time Julia Evans (I have her in my syndication list, but saw her post from HN), shared a very interesting list of pupular git config options, source
My favorite was:
git config --global merge.conflictStyle zdiff3
which shows the conflicts using this format:
<<<<<<< HEAD
def parse(input):
return input.split("\n")
||||||| b9447fc
def parse(input):
return input.split("\n\n")
=======
def parse(text):
return text.split("\n\n")
>>>>>>> somebranch
The section between |||||| and ==== is the code before the HEAD and somebranch which is really cool to see because normally you can’t decide without knowing how it was before.