Difference between revisions of "Git merge main --allow-unrelated-histories"
Jump to navigation
Jump to search
| Line 7: | Line 7: | ||
== See also == | == See also == | ||
* {{git merge}} | * {{git merge}} | ||
| + | |||
| + | [[Category:Git]] | ||
Revision as of 13:40, 19 October 2021
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
Advertising:
