git merge main --allow-unrelated-histories

From wikieduonline

Jump to navigation Jump to search

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.

See also[edit]

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

Retrieved from "https://www.wikieduonline.com/index.php?title=Git_merge_main_--allow-unrelated-histories&oldid=92880"

Git

Advertising: