Git merge/replace orphan branch into master
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git checkout --orphan new-framework | |
| # completely rewrite your application in new framework | |
| git merge --strategy=ours --allow-unrelated-histories master | |
| git commit-tree -p HEAD^2 -p HEAD^1 -m "Merge branch 'new-framework'" "HEAD^{tree}" | |
| git reset --hard $OUTPUT_FROM_PREVIOUS_COMMAND | |
| git checkout master | |
| git merge --ff-only new-framework |
brilliant,it saved my time,thanks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
brilliant,it saved my time,thanks.