How do you keep code integration from becoming an ongoing nightmare? The solution is simple: integrate your code more often to reduce collisions and simplify merges. Use a CI system to verify that things still work.
Tip 30: Integrate often, and build and test continuously
I used to work with a guy who synced his source area once a month and created headaches for both himself and the whole team. That is when I learned to do frequent, small integrations.