Pijul and similar patch-based systems are a lot better. They match my understanding of independent changes combining. git does the stupidest thing and just compares states - which means it has less information to automatically merge correctly
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments