Re: submodule modify/delete wrong message

2017-12-11 Thread David Turner
On Mon, 2017-12-11 at 12:27 -0800, Stefan Beller wrote: > On Mon, Dec 4, 2017 at 1:39 PM, David Turner > wrote: > > When merging with a submodule modify/delete conflict (i.e. I've > > deleted > > the submodule, and I'm merging in a branch that modified it), git > > lies > >

Re: submodule modify/delete wrong message

2017-12-11 Thread Stefan Beller
On Mon, Dec 4, 2017 at 1:39 PM, David Turner wrote: > When merging with a submodule modify/delete conflict (i.e. I've deleted > the submodule, and I'm merging in a branch that modified it), git lies > about what it is doing: > > "CONFLICT (modify/delete): submodule deleted in

submodule modify/delete wrong message

2017-12-04 Thread David Turner
When merging with a submodule modify/delete conflict (i.e. I've deleted the submodule, and I'm merging in a branch that modified it), git lies about what it is doing: "CONFLICT (modify/delete): submodule deleted in HEAD and modified in submodules. Version submodules of submodule left in tree at