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,257,440
Community Members
 
Community Events
164
Community Groups

merge conflict in master branch

need help to get the solution of merge conflict in repository

 

2 comments

Ganesh Babu Community Leader Dec 23, 2019

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"

Ganesh Babu Community Leader Dec 23, 2019

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

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...

1,393 views 1 7
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