[jay_kyburz]

How do you get a merge conflict with yourself?

[akkartik]

By maintaining a family of related forks/branches: https://akkartik.name/freewheeling

[codr7]

Thanks a bunch, now the coffee is on my keyboard.

[lnenad]

By trying really hard