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 ?

Alex Pons May 15, 2018

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

3 votes
Answer accepted
Isabella Stephens Atlassian Team May 17, 2018

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 May 18, 2018

thanks!

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Published in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

1,872 views 1 19
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