S
S
Sergey Larin2018-04-16 11:52:45
git
Sergey Larin, 2018-04-16 11:52:45

Is it possible to merge branches with a difference of more than 700 commits?

Recently switched to a project in which, in my opinion, a big mess with branches. There are more than 100 branches in the repository itself, and it seems that no one has ever cleaned them. The dev branch is used to add new features, but there is also a branch with a new design and the difference with the dev there was more than 700 commits last week.
I suggested to the management to start merging them now because I'm scared to think how this whole mess will be merged at the final. at first they seemed to agree, but then they ultimatum refused without any arguments. at the same time, about two weeks are left before the internal deadline for the release.
There is a feeling that there will be a lot of mats and shouts from the management at the deadline why the developers are so stupid and cannot put everything together
are there any normal solutions for such a situation and how typical is it to merge branches where there are such a large number of differences?

Answer the question

In order to leave comments, you need to log in

3 answer(s)
S
Saboteur, 2018-04-16
@saboteur_kiev

The number of possible conflicts is not related to the number of commits and branches.
If all branches work with different files, different directories, then there will be no problems at all.
Nobody bothers to try to merge into the working directory on the local machine (without commits), and see if there are any conflicts.
In general, there should be an architect and team leaders who should actually make the decision.

L
Lander, 2018-04-16
@usdglander

Well... really, why not? Judging by the fact that one of them is a branch with a design, it is even possible that there will be no conflicts.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question