you are viewing a single comment's thread
view the rest of the comments
[–] 7 points 3 years ago (1 child)

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)

  • source
  • parent
  • hideshow 2 child comments