Skip to content

Instantly share code, notes, and snippets.

@fajrif
Created September 16, 2011 18:59
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save fajrif/1222825 to your computer and use it in GitHub Desktop.
Save fajrif/1222825 to your computer and use it in GitHub Desktop.
update fork with original repo
git remote add <remote_name> <original-repo>
# => add remote refs named (whatever) to targeted the original repo
git fetch <remote_name>
git merge <remote_name>/<branch-name>
# => safely gathers any commits from original repo and stores them in your local repo
** if auto-merging conflict, use `git diff --color` to check/edit the files
and commit it first before push to the remote repo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment