When a pull request has a conflict, the message given in Show Details (shown below) is absolutely wrong when your company uses a rebasing flow. We have a large organization, and as many times as we tell people not to follow the instructions, they still do it. How do we change this message?
Message given:
Merge conflict
This pull request has conflicts.
You must resolve the conflicts by manually merging develop into this branch. After the conflicts are resolved you will be able to merge the pull request.
Step 1: Checkout the source branch and merge in the changes from the target branch. Resolve conflicts.
git checkout feature/ADS-22261-gemini-memory-8 git pull origin develop
Step 2: After the merge conflicts are resolved, stage the changes accordingly, commit the changes and push.
git commit git push origin HEAD
Step 3: Merge the updated pull request.
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.