git merge main

• https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging

git merge main
fatal: refusing to merge unrelated histories

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

git add .gitignore
git commit

git merge origin/main

See also

• Merge Request (MR), GitLab merge queue: git merge, git merge main, git merge origin/main, git merge main --allow-unrelated-histories
• git: [config | init | status ], git add, git rm, git commit, git push, git pull, .gitconfig, .gitignore, git (clone, fetch, pull), git tag, git log, git blame, Merge Request, LFS, git branch, git apply, git rebase, git diff, git diff-tree, git config --global, remote | submodule | request-pull, GIT_TRACE, GIT_CURL_VERBOSE, clean, main, git show-ref, git reset, git prune, git ls-remote origin, git checkout, git switch, pathspec, git credential-osxkeychain, git version, pre-commit, git --help, GitBook, refs/