Created by Michiel Huygen [Administrator], last modified on Sep 13, 2013

This page will explain the basic of using git.

  1. NEVER PULL!!!!!!! (so really never PULL), yea i'm sure, i meant PULL (so don't pull)
  2. ALWAYS COMMIT FIRST!!!! Several commands will not work when you did not commit, or strange things WILL happen, so ALWAYS commit first.

General GIT usage

We are using a distributed workflow with git. This means everybody has his own public repository. This means that everyone can read this public repository, but only you can write to it. You then make several local repositories of this remote, public repository. It is in these local repositories that you work with files. The 2 most common operations for working together are:

  • So if you want changes from someone else, you must fetch from his public.
  • If you want to push changes to someone else, you push them to your own public first, and ask the other person to add the changes to his public.

Fetch

Use fetch to get all git versioning data from a repository. This does not affect files on your files system, so it is always safe to fetch.

Commit

TODO

Rebase

Rebase your current branch onto a target branch.

Rebase will re-apply all new commits of your Active branch, as if you did you work on the target branch initially. Git will try to recommit each of your current branches commit in order, and notify you of conflicts.

  • If you don't know what the change is, or if you don't care about a conflicted file, always USE THEIRS.
  • ONLY use your changes if you deliberately made the changes

After a rebase, allways try to run your project first, there might and probably often will be build related or compile problems. After fixing those, perform a final 'rebase' commit. No your rebase should be complite.