handson: git (or version control in general...)

17
Git (or version control in general..) invited talk in the scope of the hochleistungslabor's meeting series: very intelligent researchers giving insights into national and international approaches. Rostock, 2015-04-08 Martin Scharm

Upload: martin-scharm

Post on 08-Aug-2015

647 views

Category:

Software


1 download

TRANSCRIPT

Page 1: HandsOn: git (or version control in general...)

Git(or version control in general..)

invited talk in the scope of the hochleistungslabor's meeting series:

very intelligent researchers giving insights into national and international approaches.

Rostock, 2015-04-08

Martin Scharm

Page 2: HandsOn: git (or version control in general...)

http://www.phdcomics.com/comics/archive/phd101212s.gif

Page 3: HandsOn: git (or version control in general...)

http://smutch.github.io/VersionControlTutorial/_images/vc-xkcd.jpg

Page 4: HandsOn: git (or version control in general...)
Page 5: HandsOn: git (or version control in general...)
Page 6: HandsOn: git (or version control in general...)
Page 7: HandsOn: git (or version control in general...)
Page 8: HandsOn: git (or version control in general...)
Page 9: HandsOn: git (or version control in general...)
Page 10: HandsOn: git (or version control in general...)
Page 11: HandsOn: git (or version control in general...)
Page 12: HandsOn: git (or version control in general...)
Page 13: HandsOn: git (or version control in general...)
Page 14: HandsOn: git (or version control in general...)
Page 15: HandsOn: git (or version control in general...)

Let's also look at...

● Commit messages/hashes/etc

● What are branches for?

● What are tags?

● Debug something + cherry-pick

● Undoing things in git

● Change a commit message

● Git diff

● Git log

● Git stash

● Github, bitbucket, etc

● Sync multiple machines/backup

● Which files (not) to version-control!? →.gitignore

● Git modules

● Git aliases

● Relative pathes (^ and ~)

● Anything you want to see?

Page 16: HandsOn: git (or version control in general...)

Common Problems

● Detached head

● Merge conflicts + strategies

● Cannot pull/push

● Collaboration? Common remote? SSH-Key/certificates etc...

● Git in cloud (dropbox/unison and stuff)

● Anything you experienced?

Page 17: HandsOn: git (or version control in general...)

http://imgs.xkcd.com/comics/git_commit.png