Merging and deconflicting if you want to reunite forks could be a fun problem to solve in the future
Future forks: "One of us."
(Thanks to I, Robot for a cute scene.)
Reply on news.ycombinator.com