Using Git

To implement version control this year we’ll be using a tool called git combined with a website called Github. Git allows us to save changes to our code as we make them, called commits, each associated with a certain message. This way, we will be able to coordinate better, know who changed what and when, and go back to old code if the current program doesn’t work.

• How to use Git + Github:

  • Pull the code from Github: this updates the code on your laptop with the code currently residing on Github:
  • Open up the Github app.
  • Sign in to your Github account, and select lexrobotics.
  • Double click on lexrobotics/2014 to open up the repository, and hit “sync” at the top to get the latest from Github.

• Edit the program! Make sure that you coordinate with your programming teammates using the second laptop so that you don’t both edit the same file at once.

• When you finish making a significant change to your program, save it and navigate to the Github app to commit your changes.

• The app will show you the changes you’ve made, and have a message on the right saying “uncommited changes.”

• Type in a commit message that describes what you’ve done. It should be clear and concise.

• Good example: “Changed speed of all motors for finer control”

• Poor example: “PLEASE WORK!!!”

• Click “commit” and continue working on your code.

• When you’re all done for the day and ready to sync your commits back up with the system, you need to push your changes back to Github.

  • Go back into the Github app and hit “publish.” This will be in the same place as the sync button from Step 1.