How to parallelize git merge?

Question

git

Hello.
We have a git repo, there are a lot of files in the repo.
Occasionally it is necessary to add changes "outside" there.
As a result, it turns out that when executing git merge origin/branch_with_new_code_snaruji, a lot of conflicts are formed.
You have to resolve all conflicts alone on a local wheelbarrow and then do a git push.
Question: is there any clever way in the git to parallelize this process?
Maybe you can push the code along with all the conflicts, and then "everyone grabs a file, resolves the conflict, pushes"?
Or some other non-obvious ways?

Answer 1

You have a development target branch, and several feature branches: feature_1, feature_2.
1) after (almost?) each accepted pull request, all programmers merge development into their feature
branch 2) the feature branch is made as minimal as possible and uploaded to development as quickly as possible
. So there will be conflicts for a maximum of 5 minutes and there will be no need to parallel merge. And in case of any misunderstanding, you call the person who made a successful pull request and the two of you figure it out.
Judging by the fact that you are trying to push into development, but it doesn’t work out, you don’t merge with development every day and collect all conflicts, postponing them to the last day.