I am doing a big merge.
A lot of files have been removed from the repo in my branch, and in doing the merge I want to keep this change for all of those files.
There are also some files that will need explicit merging and I'm intending to use git mergetool
to merge them.
I wish to keep the "deleted by us" change (ie. the files should remain deleted) for all deleted files. Other merge conflicts I want to resolve myself.
Is there a way I can tell git to keep the deleted files deleted?
I'll leave the question - because I'm sure there is a good answer - this is what I have done in the mean time:
git status
to see the list of deleted files (1082) and the number that had merge conflicts (3)git add
on themgit mergetool < d.txt
Not elegant, but faster than pressing the letter "d" and enter 1082 times