7

Had junior devs work on a new feature on a project I spent days fixing. They spent days on the new feature but built it off of the broken version of the project and never pulled from the repository. Now when I merged their new feature onto the working and correct branch, their feature is all broken. I swear Im going to kill them all.

Comments
  • 1
    just have them update, resolve conflicts and retest their branch... its how I learned very quickly to keep my branches up to date with master :p
  • 0
    That's nasty. Real nasty.
  • 0
    merge conflicts are the stuff of nightmares.
Add Comment