Continuous integration should help to get rid of your merging headaches. I would merge way more often. The moment a developer has implemented and tested a bit o

Continuous integration should help to get rid of your merging headaches. I would merge way more often. The moment a developer has implemented and tested a bit of code -> Merge and resolve conflicts. 2-3 months are very long iterations. I think you should break your problems down into smaller parts.