Re: [sort-of-BUG] merge-resolve cannot resolve "content/mode" conflict

On Mon, Apr 04, 2016 at 10:34:34AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > Imagine a merge where one side changes the content of a path and the > > other changes the mode. Here's a minimal reproduction: > > > > git init repo && cd repo && > > > > echo base >file && > > git a

Re: [sort-of-BUG] merge-resolve cannot resolve "content/mode" conflict

Jeff King writes: > Imagine a merge where one side changes the content of a path and the > other changes the mode. Here's a minimal reproduction: > > git init repo && cd repo && > > echo base >file && > git add file && > git commit -m base && > > echo changed >file && > git commit -am

[sort-of-BUG] merge-resolve cannot resolve "content/mode" conflict

Imagine a merge where one side changes the content of a path and the other changes the mode. Here's a minimal reproduction: git init repo && cd repo && echo base >file && git add file && git commit -m base && echo changed >file && git commit -am content && git checkout -b side HEA