It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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.

1 answer

1 accepted

4 votes
Answer accepted

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Bitbucket

Atlassian supported Jenkins integration for Bitbucket Server

We’ve been building a plugin to integrate Bitbucket Server and Jenkins CI, and I’m excited to announce that our alpha is ready to download and install. It lets you seamlessly configure a Jenkins job ...

506 views 0 10
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you