Fill these in once
- Pull and let the two histories join
git pull origin main --allow-unrelated-historiesIf Git then reports conflicts, fix them like any merge conflict.
- Push the result
git push -u origin main
Check it worked
- See both histories joined
git log --oneline --graph -10
Undo it
- Stop if it goes wrong (before committing)
git merge --abort
- Pull and let the two histories join
git pull origin main --allow-unrelated-historiesIf Git then reports conflicts, fix them like any merge conflict.
- Push the result
git push -u origin main
Check it worked
- See both histories joined
git log --oneline --graph -10
Undo it
- Stop if it goes wrong (before committing)
git merge --abort
- Pull and let the two histories join
git pull origin main --allow-unrelated-historiesIf Git then reports conflicts, fix them like any merge conflict.
- Push the result
git push -u origin main
Check it worked
- See both histories joined
git log --oneline --graph -10
Undo it
- Stop if it goes wrong (before committing)
git merge --abort