[PPT] - VERSION CONTROL AND GIT 1 / 23 PROBLEM SCENARIO 1: WORKING ALONE PowerPoint Presentation

SLIDE 1

VERSION CONTROL AND GIT

1 / 23

SLIDE 2

PROBLEM SCENARIO 1: WORKING ALONE

How do you keep track of changes, and different versions of your work?

2 / 23

SLIDE 3

SOLUTION?

3 / 23

SLIDE 4

PROBLEM SCENARIO 2: WORKING IN A TEAM

"My changes got overwritten!" "You weren't supposed to change that le." etc.

4 / 23

SLIDE 5

SOLUTION?

Go with the ow, and hope nothing breaks? Send emails: “Okay, I'm going to work on A.java, so don't touch it"?

5 / 23

SLIDE 6

PROBLEM SCENARIO 3: MOVING AROUND (PRE-COVID PROBLEM?)

After a hard day of work on a DH lab computer, you want to go home and do some work at home in the evening.

6 / 23

SLIDE 7

SOLUTION?

Copy all the les to your home machine Issues: potentially slow depending on your le sizes, you might overwrite something you did at home but forgot to copy from home to school, etc.

7 / 23

SLIDE 8

A REAL SOLUTION

8 / 23

SLIDE 9

VERSION CONTROL

9 / 23

SLIDE 10

VERSION CONTROL

Keeps code in a central location ("repository") This is the master copy To make changes to it, you can create a local copy of the repository in your account at school, on your machine at home, on your laptop…

10 / 23

SLIDE 11

COMMITTING

When the local copy changes, "commit" and "push" the changes to the repository.

11 / 23

SLIDE 12

SOLUTION TO PROBLEM SCENARIO #1: TRACKING CHANGES WHILE WORKING SOLO

When you get something working, commit the changes Tools allow you to revert to a previous version Write good log messages so that you don't have to remember what changed in each version

12 / 23

SLIDE 13

SOLUTION TO PROBLEM SCENARIO #2: WORKING IN A TEAM

Each team member has their own version of the code When a team member makes changes, they can commit their code to the central git repository Other team members can pull the changes from the central repository to their local machines and make their own changes, etc.

13 / 23

SLIDE 14

SOLUTION TO PROBLEM SCENARIO #3: MOVING AROUND

A remote git repository can be accessed from anywhere! As long as you always remember to commit and push your most recent changes, you can go to any other machine and clone a local copy of the repository using a URL to your remote repository

14 / 23

SLIDE 15

COMMON GIT COMMANDS FOR GETTING THE FILES FROM A REMOTE REPOSITORY

Clone the repository located at <repo> into the folder called <directory> on the local machine.

You will now have all the les from the repository available locally. You will typically use this once (per machine). Do not clone the same repo

ver and over.

Next time you want to get the most recent version of the remote repo les, just use the command "git pull".

git clone <repo> <directory>

15 / 23

SLIDE 16

COMMON GIT COMMANDS FOR MAKING CHANGES TO A REMOTE REPOSITORY

After making changes to one of these les, you should use the following commands to keep the remote git repo synchronized with your local copy:

16 / 23

SLIDE 17

r

Add specied <le> or all edited les to a "staging area". This tells Git that you want to include updates to a particular le in the next commit. (Note: This command does not actually change anything! You have to commit your changes rst.)

git add <file> git add --all

17 / 23

SLIDE 18

This command captures a snapshot of the project's currently staged changes; you should always provide some sort of message along with a commit to make it easier to keep track of what changes were just made. This commits your changes to your local git repository.

git commit -m "<message>"

18 / 23

SLIDE 19

Lastly, in order to synchronize your local repo with the remote repo, you must remember to git push. It's a common mistake to commit but forget to push, which means none of your team members working at different locations would be able to see the changes you committed!

git push

19 / 23

SLIDE 20