Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,299,251
Community Members
 
Community Events
165
Community Groups

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

0 votes

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
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,239 views 2 9
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