Created
November 11, 2015 15:08
-
-
Save teddevaal/c87017110b9fb28c7425 to your computer and use it in GitHub Desktop.
Fix subtree conflict
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 filter-branch --index-filter 'git rm --cached --ignore-unmatch -rf directory/of/subtree' --prune-empty -f HEAD | |
| git subtree add --prefix directory/of/subtree git@github.com:repository.git branch --squash |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment