Before Microsoft bought GitHub and killed Atom, they were working on Xray[1] & Memo[2]:

> Memo is an operation-based version control system that tracks changes at the level of individual keystrokes and synchronizes branches in real time.

[1] https://github.com/atom-archive/xray [2] https://github.com/atom-archive/xray/tree/master/memo_core

So, it would fix this problem, and also enable real-time collaborative editing, had it been completed.

It ostensibly seems fine, updated today. https://github.com/atom/atom