I am novice in Git and use TortoiseGit as Git client
I have a conflict.
I click edit conflict and see following:
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
I am novice in Git and use TortoiseGit as Git client
I have a conflict.
I click edit conflict and see following:
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
Copyright © 2021 Jogjafile Inc.
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:
So, if you click on