Re: Merge conflicts are reported relative to root not cwd

2016-04-14 Thread Eric Deplagne
On Wed, 13 Apr 2016 14:58:40 -0700, Junio C Hamano wrote: > Stefan Beller writes: > > > $ cd t/ > > $ git merge ... > > ... > > Auto-merging builtin/submodule--helper.c > > Auto-merging builtin/fetch.c > > CONFLICT (content): Merge conflict in builtin/fetch.c > > Auto-merging builtin/clone.c > >

Re: Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Stefan Beller
On Wed, Apr 13, 2016 at 3:41 PM, Jeff King wrote: > On Wed, Apr 13, 2016 at 03:18:24PM -0700, Stefan Beller wrote: > >> * This is your preference for whole-tree operations. What are >>whole-tree operations? (Is there a concise definition? >>Are submodules whole tree operations?) >>Thes

Re: Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Jeff King
On Wed, Apr 13, 2016 at 03:18:24PM -0700, Stefan Beller wrote: > * This is your preference for whole-tree operations. What are >whole-tree operations? (Is there a concise definition? >Are submodules whole tree operations?) >These questions are motivated by origin/sb/submodule-path-misc

Re: Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Junio C Hamano
Stefan Beller writes: > * What are >whole-tree operations? "git merge" does not let you merge "changes just in my current directory". You only merge the whole tree, and you can get conflicts from all over the tree, not just in your current directory. -- To unsubscribe from this list:

Re: Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Stefan Beller
On Wed, Apr 13, 2016 at 2:58 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> $ cd t/ >> $ git merge ... >> ... >> Auto-merging builtin/submodule--helper.c >> Auto-merging builtin/fetch.c >> CONFLICT (content): Merge conflict in builtin/fetch.c >> Auto-merging builtin/clone.c >> Auto-mergin

Re: Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Junio C Hamano
Stefan Beller writes: > $ cd t/ > $ git merge ... > ... > Auto-merging builtin/submodule--helper.c > Auto-merging builtin/fetch.c > CONFLICT (content): Merge conflict in builtin/fetch.c > Auto-merging builtin/clone.c > Auto-merging README.md > ... > > It should say ../builtin/fetch.c IMHO. > Any

Merge conflicts are reported relative to root not cwd

2016-04-13 Thread Stefan Beller
$ cd t/ $ git merge ... ... Auto-merging builtin/submodule--helper.c Auto-merging builtin/fetch.c CONFLICT (content): Merge conflict in builtin/fetch.c Auto-merging builtin/clone.c Auto-merging README.md ... It should say ../builtin/fetch.c IMHO. Any reason to keep the old behavior? Thanks, Stefa