Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

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

Merge - conflict in duplicate files

When trying to merge two branches, there is a conflict in two absolutely identical files. The merge conflict cannot be resolved, the code is the same. How to get out of this situation? Thank

1 answer

Sometime git 'discovers' a merge conflict even when both sides have identical code.

Your best option is to resolve the conflict locally within an IDE or via git command line.

Here is a really good tutorial from Atlassian - https://www.atlassian.com/git/tutorials/using-branches/merge-conflicts

If you choose to use git command line - assuming you want to merge `feature` into `develop` but encounter a merge conflict you can basically use the following commands

```

$ git checkout feature

$ git pull

$ git fetch origin develop 

# this will update FETCH_HEAD to the latest commit of develop branch

$ git merge FETCH_HEAD

# the merge conflict will be reported here. follow the instructions in the tutorial. you need to edit the code in the affected files manually and save.

$ git add conflict.file1.ext conflict.file2.ext 

$ git commit

$ git push

```

The create a pull request from `feature` to `develop` in Bitbucket - the merge will be trivial.

Good luck - let me know how you go

Best, Ulrich

Izymes

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Posted in Bitbucket

How do you use the Bitbucket-Jira integration? How does it help your team?

Hey everyone, over the past year, we've added several new features on how you can use Bitbucket and Jira together. We'd love to know how you'll are using the integration and how it's helping your t...

105 views 0 2
Join discussion

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