There is a brunch, in it two people did the work. Quite a lot of conflicting files. Is it possible to somehow parallelize the task of fixing conflicts for two people, so that one corrects his changes and the other his?

Thanks in advance for the tips.

    2 answers 2

    Approximate scheme of work:

    1. Run merge, but do not push (although this will not work);
    2. Identify problem files and commits that changed them;
    3. Distribute commits among themselves;
    4. Make a git cherry-pick ΠΈΠ΄Π΅Π½Ρ‚ΠΈΡ„ΠΈΠΊΠ°Ρ‚ΠΎΡ€ ΠΊΠΎΠΌΠΌΠΈΡ‚Π° for the git cherry-pick ΠΈΠ΄Π΅Π½Ρ‚ΠΈΡ„ΠΈΠΊΠ°Ρ‚ΠΎΡ€ ΠΊΠΎΠΌΠΌΠΈΡ‚Π° group and solve problems on the spot. You can also use git cherry-pick --no-commit список ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² Ρ‡Π΅Ρ€Π΅Π· ΠΏΡ€ΠΎΠ±Π΅Π» .

    This method is not conducive to cleanliness in the repository, but it allows you to gradually approach the solution of conflicts.

      Sits together and merzhit. Either it was necessary to lead in two separate branches, or from time to time you need to keep the changes from the wizard.