I have rather big git branch with code that was created on may of this year and never before was merged with master. Compare shows huuuge difference between branch and master: about 50 new files and about 150 modified files. I’m really worried about forthcoming merge.
What can you recommend? Any advises about how better to merge etc.? Have you ever met similar situation? Any, absolutely any notices and advises are highly appreciated.
PS: Repository is under git. The most important parts of project are covered with unit tests. I’m using IDE by JetBrains (if it is important).
3
Rebase and resolve any conflicts. Then run your tests (you do have tests, right?) on the branch. If everything passes, you’re good to merge.
Do a zip-merge.
This is a sequence of merges, that simulate what may have happened if you had merged earlier. The resulting dag will look like a zip.
This is based on the assumption that the sum of the complexity of each small merge is lower than the complexity of a large merge. This will be so if there are a lot of conflicts. If I remember correctly complexity ≈ conflicts² and a² + b² + c² < (a+b+c)²
2