The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
need help to get the solution of merge conflict in repository
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"
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...
Connect with like-minded Atlassian users at free events near you!
Find an eventConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.
Host an eventYou're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events