Difference between revisions of "Git merge origin/main"
Jump to navigation
Jump to search
| (3 intermediate revisions by 2 users not shown) | |||
| Line 4: | Line 4: | ||
fatal: refusing to merge unrelated histories | fatal: refusing to merge unrelated histories | ||
| − | + | [[git merge origin/main --allow-unrelated-histories]] | |
| − | [[git merge | ||
CONFLICT (add/add): Merge conflict in [[.gitignore]] | CONFLICT (add/add): Merge conflict in [[.gitignore]] | ||
Auto-merging .gitignore | Auto-merging .gitignore | ||
Automatic merge failed; fix conflicts and then commit the result. | Automatic merge failed; fix conflicts and then commit the result. | ||
| + | |||
| + | == Related == | ||
| + | * <code>[[git merge main]]</code> | ||
== See also == | == See also == | ||
Latest revision as of 18:42, 1 December 2021
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.
Related[edit]
See also[edit]
- 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/
Advertising:
