Tech Mahindra Interview Question

How do you solve merge conflict with cherry picking