git merge theirs
git checkout branchA
git merge -X theirs branchBgit merge theirs
git checkout branchA
git merge -X theirs branchBgit resolve conflict using theirs
git checkout --theirs path/to/fileCopyright © 2021 Codeinu
Forgot your account's password or having trouble logging into your Account? Don't worry, we'll help you to get back your account. Enter your email address and we'll send you a recovery link to reset your password. If you are experiencing problems resetting your password contact us
