1. How to automatically resolve a Git conflict by taking the version in the current branch

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

    2