| commit | ff72af00f86cbbaaab57c886c70f9799715ca02f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 10 Dec 2007 19:22:05 +0000 (10 11:22 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 11 Dec 2007 08:40:56 +0000 (11 00:40 -0800) | ||
| tree | 301c0913f7fc3b8199e7751524305d9e1b04cca7 | treesnapshot (tar.gz zip) |
| parent | 591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d | commitdiff |
Support a merge with conflicting gitlink change
merge-recursive did not support merging trees that have conflicting
changes in submodules they contain, and died. Support it exactly the
same way as how it handles conflicting symbolic link changes --- mark it
as a conflict, take the tentative result from the current side, and
letting the caller resolve the conflict, without dying in merge_file()
function.
Also reword the error message issued when merge_file() has to die
because it sees a tree entry of type it does not support yet.
[jc: fixed up initial draft by Finn Arne Gangstad]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive did not support merging trees that have conflicting
changes in submodules they contain, and died. Support it exactly the
same way as how it handles conflicting symbolic link changes --- mark it
as a conflict, take the tentative result from the current side, and
letting the caller resolve the conflict, without dying in merge_file()
function.
Also reword the error message issued when merge_file() has to die
because it sees a tree entry of type it does not support yet.
[jc: fixed up initial draft by Finn Arne Gangstad]
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge-one-file.sh | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory |