git the easy way

62
Git-r-done

Upload: joe-morgan

Post on 13-Apr-2017

70 views

Category:

Software


1 download

TRANSCRIPT

Git-r-done

Why Use Git?

- Safety

- History

- Micro-training

- Openess

- Collaboration

When Should You Use Git?

When Should You Use Git?

Always

When Should You Use Git?

AlwaysCSS, JS, PHP, SASS, Python, etc.

When Should You Use Git?

AlwaysCSS, JS, PHP, SASS, Python, etc.

Anything that has and extension and can be opened in a text editor

Git is not this:

Git is not this:

Git is not this:

Git is not this:

The Old Way

Have A Copy on a Server

Copy To Desktop

Save With a New Name

Make Some Changes and Save

Or Close Without Saving

Occasionally We Update The Final Presentation

So We Review Changes

Pick The Updates We Like

Until Everyone is Synched Up

Repeat

#Winning

That’s All Version Control Is

Ok. Back to Git

Git is Pretty Much The Same

Except Instead of This:

Except Instead of This:

We See This:

Or This:

Or This:

We Tell Git Which We Want

SummarizeVersion Control Is:

• Making changes while retaining a master copy

• Having multiple copies of the same file/project

• Saving Changes

• Undoing Changes

• Combining different versions together

Command Time!

Git CommandsVersion Control Is:

• Making changes while retaining a master copy

• Having multiple copies of the same file/project

• Saving changes

• Undoing Changes

• Combining different versions together

Git CommandsVersion Control Is:

• Making changes while retaining a master copy • git clone OR git branch

• Having multiple copies of the same file/project

• Saving changes

• Undoing Changes

• Combining different versions together

Git CommandsVersion Control Is:

• Making changes while retaining a master copy • git clone OR git branch

• Having multiple copies of the same file/project • git branch

• Saving changes

• Undoing Changes

• Combining different versions together

Git CommandsVersion Control Is:

• Making changes while retaining a master copy • git clone OR git branch

• Having multiple copies of the same file/project • git branch

• Saving changes • git add; git commit; git push

• Undoing Changes

• Combining different versions together

Git CommandsVersion Control Is:

• Making changes while retaining a master copy • git clone OR git branch

• Having multiple copies of the same file/project • git branch

• Saving changes • git add; git commit OR git branch

• Undoing Changes • git reset OR git revert

• Combining different versions together

Git CommandsVersion Control Is:

• Making changes while retaining a master copy • git clone OR git branch

• Having multiple copies of the same file/project • git branch

• Saving changes • git add; git commit OR git branch

• Undoing Changes • git reset OR git revert

• Combining different versions together • git merge OR git rebase

Have A Copy on a Server

Copy To Desktop

git clone

Save With a New Name

git branch InfoLitED110

Make Some Changes and Save

git add InfoLit.ppt

git commit -m ‘Change Presentation Title’

git push

git push (if remote)

Or Close Without Saving

git reset InfoLit.ppt

Occasionally We Update The Final Presentation

So We Review Changes

git merge

Scary!

Scary!

Even More Scary!

Pick The Updates We Like

Not So Scary!

Until Everyone is Synched Up

Repeat

#Winning