Results 2 issues of Andrécio Bezerra

Would be fantastic a better flow of resolving conflicts on merge/rebase, something like that occurs on _lazygit_.

feature-request

Add a more article