Skip to content

Keeping forked repo synced

Jump to bottom
iamcreasy edited this page Nov 22, 2016 · 5 revisions

Keeping forked repo in sync

After cloning the forked repo to your local machine, pull up git in the terminal (if using GitHub desktop, press the ~(tilde) key, to pull up git terminal.)

Run these series of commands

git remote -v
# This command lists all the remote repositories
origin  https://github.com/dubeme/WAMA.git (fetch)
origin  https://github.com/dubeme/WAMA.git (push)
sleepy-hacks    https://github.com/sleepy-hacks/WAMA.git (fetch)
sleepy-hacks    https://github.com/sleepy-hacks/WAMA.git (push)

Optional, rename sleepy-hacks remote branch. Renaming, it makes it a bit easier when I've got to do command line work, since it's shorter, and name is kinda obvious.

 git remote rename sleepy-hacks upstream

Get code from upstream (sleepy-hacks/NAME_OF_CURRENT_BRANCH)

git fetch upstream

Merge into current branch

git merge upstream/NAME_OF_CURRENT_BRANCH

At this point, your local current branch is up to date with (sleepy-hacks/NAME_OF_CURRENT_BRANCH). You can push, and send pull requests.

Note: Whenever you want to be up to date, run the last 2 commands. Always make sure you are running the 'git merge' command while you are on development branch. You can check which branch you are on by running 'git status' command.

Clone this wiki locally