git

Git

Git is a system for keeping track of all of the versions of things you write, both old and new. The whole system is quite complex, so we will limit ourselves to a small portion of what it can do.

You will use it for several purposes:

  • Turning in your work
  • Backing up your work
  • Transferring work to and from home via the internet instead of using a flash drive
  • Collaborating with a group

Incomplete

It is impossible to write down everything you need to know about git. Even experienced developers need to look things up. There is the Pro Git book and many StackOverflow questions about git that you can learn from.

Pages

  • Git-ting Started
  • Downloads for Home Git package for all operating systems. Tortoise Git for Windows only. Tutorials A command line intro to git in 15 minutes. Git for Beginners. Beautiful and simple Git Guide. Local instructions Make an account on GitHub. Use your CPS email. Apply for an education account. Join our class in the GitHub Classroom. (Tell the teacher your username and get added manually.

  • Everyday Git
  • Everyday Commands All of these need to be run in the karel-* directory: ./save-it ./update: git pull from the upstream repository. git pull Merge Conflicts Sometimes you will modify a file at home without having saved (pushed) your changes at school. This causes a dreaded “merge conflict” when you update. Simple Merging If you are lucky, you are at school and you know that you just want to use the code from home (the “incoming code” from the pull).