Meet Git (longer version)

Post on 15-Apr-2017

206 views 0 download

transcript

LUCY BAIN • DEVELOPER • ATLASSIAN • @LUCYKBAIN

Meet Git

Q U E S T I O N S

L E C T U R E

E X E R C I S E

OutlineB E I N G AT L A S S I A N

P E O P L E

VA L U E S

Being Atlassian

I D E A S

F U N

Values

Open Company, No Bullshit

Build with heart and balance

Be the change you seek

Don’t fuck the customer.

Play, as a team

1% profit

1% profit 1% employee time

Employee time donated to Foundation Projects

Company equity donated to the Foundation

VALUE OF LICENSES DONATED

$41,000,000 USD

TOTAL DONATED TO CHARITY

$3,900,000 USD

Annual profit donated to charities*

1% = The Atlassian Foundation Model

COMMUNITY LICENSES DONATED 20,000

VA L U E S

P E O P L E

Being Atlassian

I D E A S

F U N

P E O P L E

VA L U E S

P E O P L E

Being Atlassian

I D E A S

F U N

I D E A S

Innovate

Innovate 24 hours

VA L U E S

P E O P L E

Being Atlassian

I D E A S

F U NF U N

Join us!

atlassian.com/company/careers/students

R E Q U I R E M E N T S

S TO RY

C O N C E P T S

C O M M A N D S

Lecture

R E Q U I R E M E N T S

S TO RY

C O N C E P T S

C O M M A N D S

Lecture

Take notes!

Story

You

Deleted a file

Make backups

Make backups

Keep a history

Keep a history

Dropbox

Dropbox

Dropbox

You changed the same file

Easily Collaborate

Easily Collaborate

View changes

View changes

View a group of changes

View a group of changes

Easily experiment

Easily experiment

Requirements

Make backups

Keep a historyMake backups

Easily collaborateKeep a historyMake backups

Easily collaborate

View changes

Keep a historyMake backups

Easily collaborate

View a group of changes

View changes

Keep a historyMake backups

Easily collaborate

View a group of changes

View changes Easily experiment

Keep a historyMake backups

Solution

Solution

Concepts

Keep a history

View changes

View a group of changes

Make Backups

Easily collaborate

Easily experiment

Commands

repository

repo

remote

git clone

local

origin

git status

git add

git commit

commit

git add

git commit

add

add

add

commit

add

commit

Commit early Commit often

git push

Only brush the teeth you want to keep

Only push the code you want to keep

git pull

git branch

branch

branch

branch

master

my-idea

master

Branch before you need to

git push

git merge

Pull regularly

git fork

You can only fork if the repo is public

git clone

local

Resources

atlassian.com/gitAdditional guides

Resources bitbucket.orgHost your code

atlassian.com/gitAdditional guides

Resources

sourcetreeapp.com

bitbucket.orgHost your code

atlassian.com/git

Visualise your changes

Additional guides

Questions

Exercise

bitbucket.org/lucybain/lucybain.bitbucket.org

Type your annotation here, dotted line can be moved or re-sized, the angle changed