| ▲ | hk__2 6 hours ago | |
> Git is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre. You can define your own merge strategy that uses a custom executable to fix conflicts. | ||