How to fix error: --ours/--theirs is incompatible without --merge in Git

# Check your repository status
git status

On branch main
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/config.js
	both modified:   README.md

# INCORRECT - missing file path
git checkout --ours
git checkout --theirs

# CORRECT - specify the conflicted file(s)
git checkout --ours src/config.js
git checkout --theirs README.md

# Check out multiple files at once
git checkout --ours file1.js file2.js file3.js

# Use a glob pattern to resolve all conflicts in a directory
git checkout --theirs src/*

# Resolve all conflicts in the entire repository
git checkout --ours .
git checkout --theirs .

git add src/config.js

# Start a merge that may produce conflicts
git merge feature-branch

# If conflicts occur, now you can use --ours/--theirs
git checkout --ours conflicted-file.txt
git add conflicted-file.txt
git commit

# Merge without auto-committing (even if no conflicts)
git merge --no-commit feature-branch

# You can still see both versions but won't have conflict markers

# Automatically prefer our version when conflicts occur
git merge -X ours feature-branch

# Automatically prefer their version when conflicts occur
git merge -X theirs feature-branch

# Strategy option: merges but prefers ours on conflicts
git merge -X ours feature-branch

# Strategy: completely ignores their changes (rarely what you want)
git merge -s ours feature-branch

# Start a rebase
git rebase main

# If conflicts occur during rebase, resolve them
git checkout --theirs conflicted-file.txt
git add conflicted-file.txt
git rebase --continue

# Equivalent to: git checkout --ours file.txt
git restore --ours file.txt

# Equivalent to: git checkout --theirs file.txt
git restore --theirs file.txt

# Restore from a specific source
git restore --source=HEAD file.txt
git restore --source=feature-branch file.txt

# Show what would be restored (dry run)
git restore --ours --dry-run file.txt