Difference between revisions of "Git merge main --allow-unrelated-histories"
Jump to navigation
Jump to search
(Created page with " git merge main --allow-unrelated-histories CONFLICT (add/add): Merge conflict in .gitignore Auto-merging .gitignore Automatic merge failed; fix conflicts and then...") |
|||
| Line 1: | Line 1: | ||
| − | [[git merge main --allow-unrelated-histories | + | [[git merge main]] --allow-unrelated-histories |
CONFLICT (add/add): Merge conflict in [[.gitignore]] | CONFLICT (add/add): Merge conflict in [[.gitignore]] | ||
Auto-merging .gitignore | Auto-merging .gitignore | ||
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:
