| commit | 20b178de7b20a0ebf02b8da3b4791c06fc8e3a63 | |
| author | Finn Arne Gangstad <finnag@pvv.org> | |
| Tue, 18 Dec 2007 19:50:28 +0000 (18 20:50 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Dec 2007 00:58:42 +0000 (19 16:58 -0800) | ||
| tree | 7d363898fe9d67392bc45bc8cf79bf54af057a46 | treesnapshot (tar.gz zip) |
| parent | 5909651ea2be69932d9b739b4441ca857ced7660 | commitdiff |
Improved submodule merge support
When merging conflicting submodule changes from a supermodule, generate
a conflict message saying what went wrong. Also leave the tree in a state
where git status shows the conflict, and git submodule status gives the user
enough information to do the merge manally. Previously this would just fail.
Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When merging conflicting submodule changes from a supermodule, generate
a conflict message saying what went wrong. Also leave the tree in a state
where git status shows the conflict, and git submodule status gives the user
enough information to do the merge manally. Previously this would just fail.
Signed-off-by: Finn Arne Gangstad <finnag@pvv.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |