A better version control system. I really like git a lot of the time, but a good deal of the time I get really frustrated with the complexity, and it was even more frustrating when I was learning it.

I want a version control system that I can pick up and use, one that is intuitive to use and doesn't get in the way of writing. It would be similar to word's track changes, but with branches.

I've been giving this some thought, but I don't even know if it is technically possible, let alone feasible.