Skip to content

Latest commit

 

History

History
44 lines (26 loc) · 1.85 KB

git-guide.md

File metadata and controls

44 lines (26 loc) · 1.85 KB
Raw

Rebasing your repo

Rebasing your repo brings code from the main repo into your own; this means bringing the code you're working on, up-to-date with your colleagues.

It is a good idea to rebase often, and you should always rebase before doing a commit.

Once you have done a commit, you should not do additional rebases until your work has been merged into the main repo.

To do a rebase, you need to bring up a terminal at the location of the project. Under OS X, this is most easily done with the Github client, by selecting Open in Terminal from the Repository menu. Under Windows, this is most easily done with the Github client, by selecting Open in Git Shell from the gear menu at the top right.

Under OS X, only the first time your do a rebase, you will need to issue the following commands:

git remote add upstream https://github.com/jasp-stats/jasp-desktop.git
git checkout development

Under windows, only the first time you do a rebase, it is necessary to issue:

git checkout development

Subsequently on all platforms you can rebase your repo with the following commands:

git stash

note the output from this command; does it say "No local changes to save" (or something like it)?

git fetch upstream
git rebase upstream/development
git push

if the git stash above output "No local changes to save" then do not do this last command:

git stash pop

What this does:

  • git stash : stashes your changes (hides them temporarily)
  • git fetch upstream: fetches the code from the main repo
  • git rebase upstream/development: makes your repo the same as the main one
  • git push: pushes the changes to your repo on github
  • git stash pop: recovers/returns the changes that you stashed at the beginning

This results in the latest work from the main repo, with your changes on top.