[mpbart]

Some of these things like a visual history of changes you can get from using a git client like sourcetree. For other things you listed I’m not sure that they actually make your life easier. For instance, AI conflict resolution sounds great but what happens when it accidentally picks the wrong changes and you need to manually fix those?

I think git has a steep learning curve to begin with but once you spend some time using it things start to get a bit easier.