summaryrefslogtreecommitdiff
path: root/t/t4111-apply-subdir.sh
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-11-07 20:40:26 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-08 14:23:53 +0900
commit7f8671656f31f5d1cc9d9748b7dc62b76a428cc5 (patch)
tree89131f74d4a4c5af40818e9f212506bf4c76678f /t/t4111-apply-subdir.sh
parentmerge-recursive: new function for better colliding conflict resolutions (diff)
downloadtgif-7f8671656f31f5d1cc9d9748b7dc62b76a428cc5.tar.xz
merge-recursive: fix rename/add conflict handling
This makes the rename/add conflict handling make use of the new handle_file_collision() function, which fixes several bugs and improves things for the rename/add case significantly. Previously, rename/add would: * Not leave any higher order stage entries in the index, making it appear as if there were no conflict. * Would place the rename file at the colliding path, and move the added file elsewhere, which combined with the lack of higher order stage entries felt really odd. It's not clear to me why the rename should take precedence over the add; if one should be moved out of the way, they both probably should. * In the recursive case, it would do a two way merge of the added file and the version of the renamed file on the renamed side, completely excluding modifications to the renamed file on the unrenamed side of history. Use the new handle_file_collision() to fix all of these issues. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4111-apply-subdir.sh')
0 files changed, 0 insertions, 0 deletions