4 ms·

How do you get a merge conflict with yourself?

• akkartik 2y ago
  By maintaining a family of related forks/branches: https://akkartik.name/freewheeling https://akkartik.name/freewheeling
• codr7 2y ago
  Thanks a bunch, now the coffee is on my keyboard.
• lnenad 2y ago
  By trying really hard