Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root


1 badge earned


Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!


Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.


Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!


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
Community Members
Community Events
Community Groups

How to share the conflict merges with other team member in a pull request?

I would like to know the way of sharing the work load with other team members for conflict merges which requires a manual resolution.

When we try to make changes for few conflict merges and commit - GIT is not allowing as there are few more conflicts to be solved. So is there a way to meet this need?


1 answer

0 votes
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
May 08, 2023

Hi Balasri,

I don't think there is an easy, automated way of doing that. If you want to keep the version of the conflicted file in a certain branch, you could do the following:

Assume you have a PR from feature-A branch to dev branch and conflicted files fileA.txt and fileB.txt

For fileA.txt, if you want to keep the version of the file in feature-A branch, then

  • checkout dev branch
  • edit fileA.txt to match the content of the file in feature-A branch
  • commit and then push dev branch to Bitbucket

If you want to keep the version of the file in dev branch, then

  • checkout feature-A branch
  • edit fileA.txt to match the content of the file in dev branch
  • commit and then push feature-A branch to Bitbucket

Then, for fileB.txt, another team member could do the same.

You would need to communicate with your team members which files each of you is going to adjust, to prevent further conflicts.

Kind regards,

Suggest an answer

Log in or Sign up to answer
Site Admin
AUG Leaders

Atlassian Community Events