WHAT

IS

GIT?

files + change history

files + change history = repository

hosted git service

WHY

USE

GIT?

better personal workflow

friction-less collaboration

better personal workflow

better personal workflow

When you want to create a check-point in your work

you "Save As.." and increase counter

you "Save As.." and increase counter

...you commit your changes

project storytelling

better personal workflow

the-sequential-roof.3dm

the-sequential-roof.3dm

Add first layer

the-sequential-roof.3dm

Add second layer

the-sequential-roof.3dm

Fix corners

the-sequential-roof.3dm

Change beam widths

Initial commit

project storytelling

better personal workflow

vs

project storytelling

On every commit there's meta data:

better personal workflow

Who?

What?

When?

project storytelling

better personal workflow

less file clutter

less manual steps

less redundant info

 

more meaningful meta data

better traceability

project storytelling

WTF!

IT WAS WORKING YESTERDAY

better personal workflow

time
travel

Add first layer

Add second layer

Fix corners

Change beam widths

Initial  commit

2016-12-01 by George

2017-01-03 by Marty

2017-01-06 by Dr. Emmett

2017-01-10 by Marty

2017-12-30 by Bill

Change beam widths

2017-12-30 by Bill

Alternative widths

2017-12-31 by Marty

Merge

2017-12-31 by Marty

GO BACK IN TIME

FIX PROBLEM

MERGE WITH MASTER

better personal workflow

time
travel

full change history storage

go back & forth in history

multi-file changes are atomic

friction-less collaboration

friction-less collaboration

share work

github

you

sync

clone

them

sync

push

sync

push

sync

pull & merge

GET A LOCAL COPY

MAKE CHANGES

sync

PUBLISH CHANGES

THEY MAKE CHANGES

AND SO DO YOU

MERGING IS EASY

friction-less collaboration

project files are local

better project visibility

async collaboration

parallel experimentation

implicit backup system

share work

Use a visual GIT client

Github Desktop

desktop.github.com

Use a simple diff tool

P4Merge

perforce.com/product/components/perforce-visual-merge-and-diff-tools

Use a simple diff tool

Use an awesome editor

Visual Studio Code

code.visualstudio.com

https://u.nu/gitstart

Thank you!

Workflow

Commit early, commit often

Happy?

Push your changes

Create a branch when starting a new task

Open a pull request

Merge back to master

Icons by Nick Bluth from the Noun Project

Git in dfab 2020

By Gonzalo Casas

Git in dfab 2020

  • 351