Merge - conflict in duplicate files

[Alex]

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

[Ulrich Kuhnhardt _IzymesCo_]

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