Git Stuff

Git Links:

• Throw away Local Commits
• Delete branch locally and remotely
• Updates were rejected because the tip of your current branch is behind
• Resolve merge conflicts when auto merge fails

Git Submodule Resources:

• Very good thorough post on git submodules

Commands:

Prunes branches your local git is aware of:

git remote prune origin

Create branch off another branch:

git checkout -b my-feature-branch master

Submodule commands:

Pull changes to submodule after cloning:

git clone git://github.com/foo/bar.git

cd bar

git submodule update --init --recursive

Pull new changes from submodule/s

git submodule update --remote --merge

Fix merge conflict in submodule:

• Fix Merge conflict in Submodule

Basically:

git checkout master submodule-dir/

Fetch repo and all branches

• Push local Git repo to new remote including all branches and tags