How to solve Conflict: Deleted in source but modified in destination ?

[Alex Pons]

I found this:

https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

but there are no examples about "Deleted in source but modified in destination"

I want to delete the file in destination too.

[Isabella Stephens · Accepted solution]

Hi Alex,

You can do this with a slight modification to the instructions you posted, if you follow the steps under "Resolving the conflict between git branches".

• Steps 1 to 4 should be the same.
• At this point, instead of resolving conflicts (as demonstrated in steps 5 and 6), you want to delete the file (for example by running "rm <path_to_your_file>").
• Steps 7 and 8 will be the same as in the linked instructions.

It seems counterintuitive to "git add" a file that you want to delete, as step 7 instructs, but this will tell git you want to track the change you've made, which in this case was to delete the file.

Cheers,

Isabella - Atlassian

[Alex Pons]

thanks!