| commit | 95d93d37082bf36efb7996851636e7d77ce7b40f | |
| author | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Fri, 26 Mar 2021 20:46:03 +0000 (26 21:46 +0100) | ||
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | |
| Sat, 3 Apr 2021 17:33:03 +0000 (3 19:33 +0200) | ||
| tree | 357a02bb3e47a5325ba0d05e6482b325b08c0dac | treesnapshot (tar.gz zip) |
| parent | a26c1447eee489e94a2895fbc03506150e0bb6dd | commitdiff |
Handle modify-delete conflicts in "Replace With->Ours/Theirs"
Figure out which files should be deleted instead of being checked out,
then run git rm on them. Remove the ReplaceWithOursTheirsMenu and
replace it with a new ReplaceConflictMenu that works on StagingEntry
elements directly, which do carry information about the kind of
conflict.
Bug: 399982
Change-Id: Ibac57ed3efd6fbf6ec9adc128ce8c41ffc0a28cb
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Figure out which files should be deleted instead of being checked out,
then run git rm on them. Remove the ReplaceWithOursTheirsMenu and
replace it with a new ReplaceConflictMenu that works on StagingEntry
elements directly, which do carry information about the kind of
conflict.
Bug: 399982
Change-Id: Ibac57ed3efd6fbf6ec9adc128ce8c41ffc0a28cb
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>