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.
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.
Prices shown in USD.
Type your email address below to get our free Urban Word of the Day every morning!
Emails are sent from email@example.com. We'll never spam you.