We are facing issue while merging code from feature branch to DEV branch. We got conflict issue because same code is merged by other developer but my changes need to go first into PROD. Can you let me know how to resolve this issue and steps to debug the conflict.
Is there any way to reset DEV branch to previous commit? Can you also explain me Merge strategies?
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