Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,300,666
Community Members
 
Community Events
165
Community Groups

How to change "helpful" message when there is a Merge Conflict?

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.

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,263 views 2 9
Read article

Community Events

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

Events near you