Become a conflict resolution hero
Why do you think that https://github.com/nomeata/gipeda is a good alternative to resolve-trivial-conflicts
Become a conflict resolution hero
Why do you think that https://github.com/nomeata/gipeda is a good alternative to resolve-trivial-conflicts