The manual coordination of software developers that occurs when two or more software developers work on the same file at the same time without a proper versioning / branching system.
Opposed to the automated 'merge' feature of many versioning systems.
Opposed to the automated 'merge' feature of many versioning systems.
Management did not grant you a branch for your project. Therefore, you must have a meeting with Bob The Developer to meat merge your code changes into his changes on the main branch.
by flipmcf April 12, 2007