projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 19b9b0b) | patch
merge-recursive: demonstrate an incorrect conflict with submodule
authorJohannes Sixt <j6t@kdbg.org>
Tue, 8 Jun 2010 11:34:12 +0000 (13:34 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Jun 2010 16:01:07 +0000 (09:01 -0700)
commit7d82b06d2be1b872a1debf79fadf0585afc70b69
tree9543032d343225699ef5056712d65c27d985c91btree | snapshot
parent19b9b0b220be08025d4db9a1c85e21637bf8fd95commit | diff
merge-recursive: demonstrate an incorrect conflict with submodule

When one side of a merge turns a directory into a submodule, and the other
side does not touch that directory (but has other non-conflicting changes),
then a merge should succeed. But currently, it does not; it rather fails
with a file/directory conflict.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3030-merge-recursive.sh diff | blob | history
Git—the stupid content tracker