I'm interested in learning the best way to resolve conflicts in a big team.
For example I have a master branch in which the team has made quite a lot of changes and then I'm rebasing latest changes from the upstream (master and upstream are not connected). And I got conflicts. The problem is that somebody in the team knows better how to solve conflicts in one file and some other knows better about the other.
So the question is: is it possible to push unresolved branch to remote wait until colleagues resolve conflicts in their local environments and push them back and then make git rebase --continue.
And if not what is the best way to solve this problem?