I am using GIt Fork method with the team . Where each team member has their own Server and local. I maintain the Master Git version. Therefore each individual fork the repo from my project on the server. Clone it from his/her server and work in a branch. Post the work is done they raise a pull request to my development branch. While doing so since multiple users want to merge to the development branch via pull request, I get merge conflict and error stating only post-merge conflict are resolved we can merge the branch. I am not sure how to resolve to merge conflict on the Bitbucket server and as the merge did not take place me pulling the repo from my server does not have feature branches raised by another user in pull request. How do i resolve this situation? or is there a way we can give access to main git repo to everyone but restrict any updates to development and master branch except one user?
Hi @Anuj-eKnous, my team developed this plugin: Power Editor for Bitbucket, which allows you to resolve conflicts on a pull request in the UI. You won't need to go through any of the git commands (even though we highly recommend you learn them, they can be quite useful). If you're using Bitbucket Server/Data Center that's an option you should check out!
It also supports:
Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...
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