Difference between revisions of "Git merge main --allow-unrelated-histories"
Jump to navigation
Jump to search
| Line 2: | Line 2: | ||
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.]] |
== See also == | == See also == | ||
* {{git merge}} | * {{git merge}} | ||
Revision as of 13:26, 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:
