Sneakpeek->QEats->Python - How to resolve merge conflicts? ( Using Git Mergetool )