Created
September 16, 2011 18:59
-
-
Save fajrif/1222825 to your computer and use it in GitHub Desktop.
update fork with original repo
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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