Created
July 17, 2018 20:17
-
-
Save themichaelyang/46a3d697700807593602a51a499cfd93 to your computer and use it in GitHub Desktop.
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
| # interactive rebase with theirs strat (favor current branch) | |
| git rebase -i -s recursive -X theirs <rebase-onto-branch> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment