Kamil Pyć

I use it for over one year and see stable improvements over time, definitely recommend! Pros: - Free- Native, good looking Mac OS app- regular updated with new features Cons: - missing option to resolve multiple conflicts at once