You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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?
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
If you want to keep the version of the file in dev branch, then
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.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.