GIT UTILS

gistfile1.md

Syncing a fork

Sync a fork of a repository to keep it up-to-date with the upstream repository. https://help.github.com/articles/syncing-a-fork/

git fetch upstream
git checkout master
git merge upstream/master

Configuring a remote for a fork

git remote add upstream https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git

Resolving a merge conflict

https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/