• BuiltWithStolenParts@lemmy.world
    link
    fedilink
    arrow-up
    7
    ·
    1 year ago

    Try reverting a reverted commit (revert of revert, yes) while other team members are working on a branch which has the first revert. It’s super fun merging after that.

    (Or something of that effect, can’t remember the exact details of that fuckup)

    • hellishharlot@lemmy.world
      link
      fedilink
      arrow-up
      4
      arrow-down
      1
      ·
      1 year ago

      I don’t think I will, mostly cause I work on a team of 1 right now which makes my branches wonderfully simple.