When we perform code integration, we're combining the software that we've written with our teams codebase. It's at this point we often discover a few things:
- How much has changed since we last committed?
- What degree of overlap has there been? For example, if shared code has been changed for different purposes.
- How well does our software work together?
During a commit of our software, we will often need to resolve differences in common code, particularly if several pieces of work are being carried out in the same area of the system simultaneously.
Modern source control systems will highlight the areas that need attention and will not allow the code commit to go ahead without first resolving the issues. We will often ...
