Am 04.02.2014 00:01, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only update the work tree of
the superproject according to the merge result but to also update the
work tree of all initialized submodules (so they match the SHA-1
Jens Lehmann jens.lehm...@web.de writes:
I think the user needs to sort things out, just like she has to do
when a file has a merge conflict. But unfortunately we cannot use
conflict markers here, so I'd propose the following:
* When merge proposes a merge resolution (which it does today by
On Fri, Feb 07, 2014 at 02:00:23PM -0800, Junio C Hamano wrote:
Jens Lehmann jens.lehm...@web.de writes:
I think the user needs to sort things out, just like she has to do
when a file has a merge conflict. But unfortunately we cannot use
conflict markers here, so I'd propose the following:
This new option will allow the user to not only update the work tree of
the superproject according to the merge result but to also update the
work tree of all initialized submodules (so they match the SHA-1 recorded
in the superproject). But this commit only adds the option without any
Jens Lehmann jens.lehm...@web.de writes:
This new option will allow the user to not only update the work tree of
the superproject according to the merge result but to also update the
work tree of all initialized submodules (so they match the SHA-1 recorded
in the superproject). But this
5 matches
Mail list logo
