| commit | 7bb1fcc6fcc5a2d0164f243fd10f346eb0822ddf | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Wed, 10 Dec 2008 20:12:59 +0000 (10 21:12 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 15 Dec 2008 10:39:57 +0000 (15 02:39 -0800) | ||
| tree | 12f184e9e7e088f38418941c6469ad57b90e01ee | treesnapshot (tar.gz zip) |
| parent | 544ddb045a4bd49da9ffc1d9da80bdc0d71b2518 | commitdiff |
modify/delete conflict resolution overwrites untracked file
If a file was removed in HEAD, but modified in MERGE_HEAD, recursive merge
will result in a "CONFLICT (delete/modify)". If the (now untracked) file
already exists and was not added to the index, it is overwritten with the
conflict resolution contents.
In similar situations (cf. test 2), the merge would abort with
"error: Untracked working tree 'file' would be overwritten by merge."
The same should happen in this case.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If a file was removed in HEAD, but modified in MERGE_HEAD, recursive merge
will result in a "CONFLICT (delete/modify)". If the (now untracked) file
already exists and was not added to the index, it is overwritten with the
conflict resolution contents.
In similar situations (cf. test 2), the merge would abort with
"error: Untracked working tree 'file' would be overwritten by merge."
The same should happen in this case.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7607-merge-overwrite.sh | [new file with mode: 0755] | blob |