git merge origin/main

git merge origin/main
fatal: refusing to merge unrelated histories

git merge origin/main --allow-unrelated-histories
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.

Errors

• Current HEAD is out-of-date with the remote base branch: Please update the current branch with the latest changes from the default branch.

Related

• git merge main

See also

• Merge Request (MR), GitLab merge queue: git merge, git merge main, git merge origin/main, git merge main --allow-unrelated-histories, --squash