Question about about a trivial merge conflict that git should resolve alone

Hi, I have a simple merge conflict use case: $ mkdir foo $ cd foo/ $ git init $ echo line1 > a $ git add . $ git commit -q -m init $ echo line2 >>a $ git commit -a -q -m "add line2" $ git checkout -b foo HEAD~1 $ git cherry-pick -x master $ echo line3 >>a $ git stage a $ git commit -q -m "add

Re: Question about about a trivial merge conflict that git should resolve alone

Hi Francis, On Fri, 23 Oct 2015, Francis Moreau wrote: > I have a simple merge conflict use case: > > $ mkdir foo > $ cd foo/ > $ git init > $ echo line1 > a > $ git add . > $ git commit -q -m init > $ echo line2 >>a > $ git commit -a -q -m "add line2" > $ git checkout -b foo HEAD~1 > $ git