Skip to content

Instantly share code, notes, and snippets.

@teddevaal

teddevaal/gist:c87017110b9fb28c7425

Created November 11, 2015 15:08
Show Gist options
  • Save teddevaal/c87017110b9fb28c7425 to your computer and use it in GitHub Desktop.
Save teddevaal/c87017110b9fb28c7425 to your computer and use it in GitHub Desktop.
Download ZIP
Fix subtree conflict
Raw
gistfile1.txt
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 [email protected]:repository.git branch --squash
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment