How to resolve Deleted merge conflict in TortoiseGit?

2.7k Views Asked by At

I am novice in Git and use TortoiseGit as Git client

I have a conflict.
I click edit conflict and see following:

enter image description here

Can you explain what will happen if I click on
1. Modified
2. Delete
3. Abort

P.S. Actually I want to merge local and remote branch

1

There are 1 best solutions below

5
On

A deleted merge conflict occurrs if at the same time a file is deleted on one branch and modified on another branch. In your case the file was deleted on the active branch and deleted on the branch you're trying to merge.

Now you have to decide how to go on:

  • Mark the file as deleted and ignore changes to the file - or
  • mark the file as still-important in order to be kept and, thus, mark it as modified.

So, if you click on

  • Modified: The modified file will be used (in the working tree and index)
  • Delete: The modified file is discarded and the file will be removed in the working tree and index
  • Abort: The dialog will be closed and the conflict won't be resolved.