resolving automatic merge failure

I have committed a .jar file in my 1603 repository and created a pull request for the same.The pull request was approved and merged but is causing automatic merge conflict while merging from 1603 to 1604 version. Is there any way where I could resolve the merge conflict that is stopping the automatic merge to 1604?

1 answer

Not sure what you're using for your remote repository, but for Stash/Bitbucket it is necessary to resolve conflicts locally.

Best way is, working locally, to either merge the master branch (or whatever branch you're trying to merge into with your Pull Request) into your feature branch or rebase the feature branch on top of the master branch, then resolve conflicts locally in the feature branch, then push and issue the Pull Request (or, since you've already issued one, allow it to be automatically updated)

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Rachel Wright
Published yesterday in Training & Certification

How to Extend your Jira Administrator Certification

...; didn’t   know about Jira email!  For example, did you know Jira will try to send a notification message 10 times?  I didn’t!  As soon as I learned that, I searched for any active...

87 views 2 10
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you