'Git started' - verteilte Versionsverwaltung mit Git

Motivation: Warum Versionsverwaltung?
Initialisierung
Datastructure: Tree
Branching & Reintegration
Resetting
Remotes & Empfangen von Änderungen
Beheben von Konflikten
Plattformen und Lernmöglichkeiten

Transcript

1. Git started Introduction to distributed version control with Git Yannick Baron @yannick_baron yannick.baron@thinktecture.com
2. “Git is easy”
3. Clone the repository “Git is easy”
4. Clone the repository Make changes “Git is easy”
5. Clone the repository Make changes Mess things up “Git is easy”
6. Clone the repository Make changes Mess things up Look at StackOverflow “Git is easy”
7. Clone the repository Make changes Mess things up Look at StackOverflow Mess things up even more “Git is easy”
8. Clone the repository Make changes Mess things up Look at StackOverflow Mess things up even more Delete folder “Git is easy”
9. Clone the repository Make changes Mess things up Look at StackOverflow Mess things up even more Delete folder Clone the repository “Git is easy”
10. Clone the repository Make changes Mess things up Look at StackOverflow Mess things up even more Delete folder Clone the repository … “Git is easy”
11. https://stackoverflow.com/questions?tab=Votes
12. https://stackoverflow.com/questions?tab=Votes
13. Using git for 12 years now Noticed very different levels of experience Concepts often misunderstood despite daily use I <3 git
14. Time travel: Go back in time History of how project evolved Compare versions to find errors Build releases on versions Work on the same files in parallel Why version control?
15. Time travel: Go back in time History of how project evolved Compare versions to find errors Build releases on versions Work on the same files in parallel Why version control?
16. Save our butts Make us feel safe when confidently editing code Why version control for real?
17. Comfortable with Git?
18. Comfortable with Git?
19. Changes are kept track of locally Most operations performed locally Server mostly for storage only Control of when to communicate with a remote machine = fast + independent of connection Distributed?
20. Story: Writing a “book” with git Live Demo
21. Intro + chapter files Script to bundle them to a book Demo Project
22. git init initializes a git repository git status information about the current state git add <filename> adds current version of a file git commit –m “<msg>” saves added files to the history Gitting started is easy
23. The git history is a graph, a tree to be precise A node in that tree is the state of our files at a point in time Most operations deal with how to navigate and manipulate that tree The git history
24. A hierachical graph data structure Consists of nodes and edges Various ways of implementation fixed number of child nodes list of child nodes reference to parent node … Quick Interlude: Trees
25. Reference to parent node Node { parent?: Node; data: any; } const A = new Node(); Quick Interlude: Trees A
26. Reference to parent node Node { parent?: Node; data: any; } const t = new Node(); t.parent = A; A = t; Quick Interlude: Trees A
27. Reference to parent node Node { parent?: Node; data: any; } const B = A; Quick Interlude: Trees A B
28. Reference to parent node Node { parent?: Node; data: any; } const t = new Node(); t.parent = B; B = t; Quick Interlude: Trees B A
29. Reference to parent node Node { parent?: Node; data: any; } Quick Interlude: Trees B A
30. Reference to parent node Node { parent?: Node; data: any; } B = undefined; Quick Interlude: Trees A
31. The git history is a graph, a tree to be precise A node in that tree is the state of our files at a point in time Most operations deal with how to navigate and manipulate that tree The git history
32. git add --all adds all untracked files at once git status information about the current state git commit –m “<msg>” saves added files to the history Growing the tree
33. git branch <name> creates a new branch at HEAD git checkout <branch> moves HEAD to branch git commit –am “<msg>” -a add all tracked files & commits Adding a branch
34. git checkout <branch> moves HEAD to branch git diff show the diff of current changes --word-diff do a word diff git commit –am “<msg>” -a add all tracked files & commits Switching branches
35. git diff <branch> diff between HEAD and given branch git checkout <branch> moves HEAD to branch git merge <branch> –m “<msg>” merges branch into current branch git branch –d <branch> deletes given branch Reintegrating a branch
36. git init git status git add git commit git branch git checkout git diff git merge Recap #1
37. git log shows full detail log of all commits git log --oneline shows list of commit messages git log --graph --oneline shows graph of commit messages The Log and Hashes
38. https://stackoverflow.com/questions/1057564/pretty-git-branch-graphs/35075021#35075021
39. git checkout <SHA> -- <file> checks out file in given version git diff --staged shows a diff of the staged files git reset --hard <SHA> move current branch back to SHA --hard discard all changes --soft keep changes We have to go back!
40. git remote add <name> <url> adds a remote repository git push -u <remote> <branch> push branch and setup tracking Going online for the first time
41. Starting from existing Repo git clone <url> [<folder>] makes working copy of repo at url git log --graph --oneline shows graph of commit messages Multiplayer
42. git checkout –b <branch> -b create and switch to branch git commit –am “<msg>” -a add all tracked files & commits git push push changes of current branch Player 2 has entered the game
43. git fetch download changes from the remote git checkout <branch> moves HEAD to branch git pull fetches and merges tracked branch into current branch git rebase <base> <branch> replay branch’s commits on top of base Receiving changes
44. git merge <branch> –m “<msg>” merges branch into current branch git commit –am “<msg>” -a add all tracked files & commits git push <remote> :<branch> deletes branch on remote git branch –d <branch> deletes given branch Dealing with conflicts
45. git log git reset git clone git remote git push git fetch git pull git rebase Recap #2
46. We have seen 16 basic commands That’s all you need to git started Just the tip of the iceberg Git is a skill, a tool in your tool belt Expertise makes your life easier Low cost, high reward Try it! Git going!
47. and their features GitHub https://github.com BitBucket https://bitbucket.org GitLab https://gitlab.com Create online repositories Fork Repositories Pull Requests Tools for Code Reviews Continuous Integration Build Pipelines Web platforms
48. GitHub interactive Introduction https://try.github.io/ Think like a git http://think-like-a-git.net/ Watch this talk again https://youtu.be/S_OkNMHinlg GitHub Git Cheatsheet https://services.github.com/on- demand/downloads/github-git- cheat-sheet.pdf Resources
49. Thank you! Questions? Contact @yannick_baron yannick.baron@thinktecture.com
50. git reset # to unstage git commit --amend git pull --rebase (demo) conflict when rebasing git revert git add -p git rebase –i git stash git bisect uncommit Bonus Round