Note:

lazygit is a really nice Git interface for your terminal. I haven't test a merge with conflict yet. (This will be the ultimate test)