Accenture Interview Question

How to resolve git conflicts