Skip to content

Instantly share code, notes, and snippets.

@evan-dickinson
evan-dickinson / gist:11407758
Last active August 29, 2015 14:00
Merging Bootstrap with squash merges to master
# An approach of incorporating Bootstrap into a git repo,
# using subtree merging. This approach does squash merges
# from bootstrap-upstream to master, and results in merge
# conflicts.
#
# This gist is part of this StackOverflow question
# http://stackoverflow.com/questions/23095230/incorporating-bootstrap-into-a-git-repo-using-subtree-merging
# Create the repo
git init .