Is there a "theirs" version of "git merge -s ours"?

In Git, there isn't a direct "theirs" version of the "git merge -s ours" strategy like there is for the "ours" strategy. The "ours" strategy forces the current branch to be used, ignoring any changes from the branch being merged.

However, if you want to achieve a merge where you keep the changes from the branch you're merging in, ignoring changes from the current branch (similar to "theirs"), you can use a combination of commands. One approach is to use the "git reset" command along with "git merge" and "git checkout" to achieve a similar result.

Here's how you could do it:

    Merge the other branch into the current branch, but don't commit:

    bash

git merge --no-commit other-branch

Reset the current branch to the state of the other branch (their changes):

bash

    git reset --hard other-branch

This process effectively applies the changes from the other branch and discards changes from the current branch.

Keep in mind that this approach can be destructive, as it discards changes from the current branch. It's recommended to create a backup or make sure you're aware of the implications before proceeding.

Here's a step-by-step example:

bash

# Assuming you're on the "main" branch and want to merge "feature" branch
# Merge "feature" branch into "main" without committing
git merge --no-commit feature

# Reset "main" branch to match the state of "feature" branch (discard changes on "main")
git reset --hard feature

Again, be cautious when using this approach, as it can result in data loss if not used carefully. If you want to keep both sets of changes and manually resolve conflicts, you might need to resort to more traditional merge techniques and conflict resolution.