Continuous Integration - What Is the Difference?

Continuous integration is a way of taking small changes and bringing them back into the main code base all the time. The biggest thing that its solved, especially in my experience, is the multiple day merge and reconciliation process with future branches or teams king on something before one release. I've literally had teams spend two days resolving merge conflicts because there's drift among different authors of codes. It avoids a particular change bit rotting or becoming unmergeable in the first place - you don't need to bother doing it. You can avoid that sort of re work. But i think the biggest thing is just that it's, if you're continuously branching and merging, each merge is so much faster or