I noticed a strange behavior from Bitbucket when resolving merge conflicts in a pull request.
When we submit a pull request from source to target branch and there is a conflict, sometimes it suggests checkout source branch and pull target into it and sometimes it suggests checkout target branch and pull source branch.
Why does Bitbucket suggest two different approaches? Second approach sounds more reasonable since we don't want to modify source branch involved in a merge.
Has anyone faced it and knows the rational behind it?
Online forums and learning are now in one easy-to-use experience.
By continuing, you accept the updated Community Terms of Use and acknowledge the Privacy Policy. Your public name, photo, and achievements may be publicly visible and available in search engines.