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
Highlighted

merge conflict in master branch

need help to get the solution of merge conflict in repository

 

2 comments

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

 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"

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

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"

Comment

Log in or Sign up to comment
TAGS
Community showcase
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

1,519 views 0 6
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