Current work project: Ok where is the master branch?
Coworker: Oh we lost that one a few months ago due to some merge conflicts...

  • 7
    So many odd branches are floating around and I dont know why they exist. And everything is stored on a local repo on a network drive...
  • 1
    Oh boi! Good luck
  • 2
    how do you LOSE MASTER???
  • 2
    @Trithon Apparently my colleauge has his own work branch which he uses as the "master" branch. So the actual master branch got left behind a while ago. In terms of lose I mean its like a unused branch.
  • 3
    Master is dead. Long kive the new master!
  • 1
    In one project, we actually had like 4-5 branches named "master", " main", "release" etc. left behind. What would happen is, we changed a shit ton, made one huge commit, then decided that we don't want to pick an updateful of changes, so we would assert that shit was working and then add the new version on a new branch as semver-major with a todo in the comment reminding no one to merge with [previous name for master]
  • 0
    Delete the master branch and recreate it.
Add Comment