[Step 0] Best practices & Guidelines - Yellow-Team-Millerslab/GitPlayground GitHub Wiki

  • NEVER force a push

    If you find yourself in a situation where your changes can't be pushed upstream, something is wrong. Contact another team member for help tracking down the problem.

  • NEVER modified published history

    Yes, of course, git allows you to rewrite public history, but it is problematic for everyone and thus it is just not best practice to do so.

Ref

Some useful terms

master: this is the main code branch, equivalent to default in Mercurial. Branches are generally created off of master.

origin: the default remote repository that all your branches are pulled from and pushed to. This is defined when you execute the initial git clone command.

unpublished vs. published: an unpublished branch/commit is a branch/commit that only exists on your local workstation, in your local repository. Nobody but you know that branch/commit exists. A published branch/commit is one that has been pushed up to GitHub, and is available for other developers to checkout and work on.

fast-forward: the process of bringing a branch up-to-date with another branch, by fast-forwarding the commits in one branch onto the other.

rebase: the process by which you cut off the changes made in your local branch, and graft them onto the end of another branch.

Other tutorials: