Report question

Question: How to automatically resolve a Git conflict by taking the version in the current branch?