Git 101: Conquer the GIT POWER
The production deploy task started, but it fails shortly after. A CONFLICT was found inside MASTER from a commit YOU did.
Your blood freezes as you feel another dev touching your shoulder. You both stare at each other like this:
These articles will help you avoid entirely or at least make it easier to handle those kinds of situations.