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?
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)
Badges are a great way to show off community activity, whether you’re a newbie or a Champion.Learn more
Happy Friday, Funmakers! We had a Community Team offsite in Austin this week, and my mind feels primed for thinkin' from all the brainstorming we did! So, this week's Friday Fun thread w...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG