merge conflict in master branch

[Gayatri Gangele]

need help to get the solution of merge conflict in repository

[Ganesh Babu]

Hello,

Merge Conflict occurs when the same lines are being edited both in the source and destination file. This merge conflict can be resolved by keeping the required lines from source or destination.

Clone the repository and fix the merge conflict

[Gayatri Gangele]

 cloned the repository to my master branch but it again showing merge conflict error in my other branch ,its showing that "automatic merge failed;fix conflict and then commit the result"

[Ganesh Babu]

Ok, Try following this documentation this might help you to resolve the issue you are facing.

And for me to look please share the screenshot.

https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html

[Gayatri Gangele]

Thank you ,Its helpfull

[Gayatri Gangele]

I cloned the repository to my master branch but it again showing merge conflict error in my other branch ,its showing that "automatic merge failed;fix conflict and then commit the result"