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

Balasri sai chandana

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?

 

Theodora Boudale

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,
Theodora