Re: [GSoC][RFC PATCH] git-merge.adoc: detail submodule merge
Show 5 quoted lines
> """
> In the case where the path is a submodule, if the submodule commit used on
> one side of the merge is a descendant of the submodule commit used on the
> other side of the merge, Git...
> """
> Yes, until `recursive` is deleted anyway. (At which point we'll just
> remap `recursive` to mean `ort` and not have to have separate
> documentation for the two.)
Ok. I'll write for both `ort` and `recursive`.
Show 5 quoted lines
> Yeah, but we don't have a way to resolve differences for those kinds
> of changes when neither side matches the base version (unless
> something like -Xours or -Xtheirs is passed, but even then that
> belongs under the -X documentation); submodules are somewhat special
> in that regard.
Thanks again! I'll send a v2 soon.
Lucas Oshiro <lucasseikioshiro@gmail.com>