git merge upstream/main --allow-unrelated-histories -X theirs
Created
March 31, 2025 21:07
-
-
Save cmwylie19/21135cabab4ee41455f0405acfcb86cc to your computer and use it in GitHub Desktop.
rebase new commits over top of old commits
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment