Sublime Forum

Resolving conflicts where one side deletes the file leaves an empty file behind after resolution


To reproduce this, create a branch and delete a file. In the upstream branch make a normal change to that same file. Merging the branchs will cause a merge conflict where one side has changed a file and another side has deleted it entirely.

In this case, I want the deleted file to win. I can’t find a way to resolve the merge in a way that doesn’t leave an empty file around after the commit is complete:

If I take the left side and and stage the resolution and commit, an empty file stays behind:

~/Code/merge-test$ file fileA.txt
fileA.txt: empty

Am I missing the right option in the UI somewhere?

Many thanks!



Not yet, see this bug report: