Practical git

Introduction talk about Git

Transcript

1. AGENDA 09:30-10:00 Git in de praktijk 10:00-10:30 Interactieve sessie 10:30-12:00 Vragen beantwoorden
2. PRACTICAL GIT Git in de praktijk
3. WIE BEN IK? Martijn De Letter software-architect@ibuildings
4. WIE BEN IK?
5. WIE BEN IK?
6. WAT WETEN JULLIE AL?
7. WAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance.
8. WAT IS GIT? Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency. Git is easy to learn and has a tiny footprint with lightning fast performance. distributed?
9. DISTRIBUTED VCS
10. DISTRIBUTED VCS
11. DISTRIBUTED VCS
12. GIT COMMANDS
13. NEW REPO $ git init
14. CHECKOUT REPO $ git clone git@github.com:mdeletter/ practicalgit.git
15. COMMIT CHANGES $ git add README.md $ git commit
16. COMMIT CHANGES $ git add README.md $ git commit why?
17. STAGE
18. BRANCHING $ git checkout master $ git branch feature/example $ git checkout feature/example
19. BRANCHING $ git checkout -b feature/example
20. MERGE CHANGES $ git checkout master $ git merge feature/develop
21. REMOTE $ git remote add origin git@github.com:mdeletter/practicalgit.git
22. REMOTE $ git remote -v origingit@github.com:mdeletter/ practicalgit.git (fetch) origingit@github.com:mdeletter/ practicalgit.git (push)
23. PUSH TO REMOTE $ git push origin master remote branch
24. CHANGES FROM REMOTE $ git fetch
25. CHANGES FROM REMOTE $ git pull $ git fetch && git merge
26. CHANGES FROM REMOTE $ git pull $ git fetch && git merge
27. GIT WORKFLOWS
28. CENTRAL REPO
29. CENTRAL REPO
30. CENTRAL REPO
31. FEATURE BRANCH FLOW
32. FEATURE BRANCH FLOW Using Pull requests
33. GITFLOW WORKFLOW
34. GITFLOW WORKFLOW • master branch • develop branch • release branch • hotfixes
35. FORK WORKFLOW
36. FORK WORKFLOW • 1 repo per developer • core maintainers in charge of ‘official’ repo • open source projects • using pull requests
37. WICH WORKFLOW? • it depends :-) • K.I.S.S. • start simple
38. TOOLING
39. GIT
40. GITHUB
41. BITBUCKET private repos for free
42. SOURCE TREE GUI
43. YOUR EDITOR OF CHOICE
44. BUT.. Use the GIT CLI
45. BEST PRACTICES
46. ALWAYS USE • README.md • .gitignore
47. KEEP YOUR HISTORY CLEAN • merge back with no fast forward • (master) $ git merge --no-ff feature/exampe • easier to rollback
48. KEEP YOUR HISTORY CLEAN • $ git pull --rebase • replay local commits onto (possible) remote commits
49. REWRITE HISTORY • $ git commit --amend • merge changes within latest commit
50. REWRITE HISTORY • $ git rebase -i HEAD~4 • rewrite, combine commits and change commit message • only use on local commits!
51. COMMIT MESSAGES
52. COMMIT MESSAGES
53. COMMIT MESSAGES • Separate subject from body with a blank line • Limit the subject line to 50 characters • Capitalize the subject line • Do not end the subject line with a period • Use the imperative mood in the subject line • Wrap the body at 72 characters • Use the body to explain what and why vs. how
54. COMMIT MESSAGES • Refactor subsystem X for readability • Update getting started documentation • Remove deprecated methods • Release version 1.0.0
55. COMMIT MESSAGES • git log --oneline | grep -i fix | wc -l
56. RESOURCES
57. RESOURCES • https://www.atlassian.com/git/tutorials/ • https://try.github.io • http://nvie.com/posts/a-successful-git-branching- model/
58. RESOURCES Gratis e-book: https://git-scm.com/book/en/v2
59. VRAGEN?
60. WAT GAAN WE DOEN?
61. OEFENING 1 • ga naar https://github.com/mdeletter/practicalgit • fork deze repo naar je eigen github account • git clone [eigen github account]/practicalgit.git • cd practicalgit • Maak een feature branch, zet je naam in de README.md • Commit je wijzigingen en push je feature branch naar je eigen repo • Ga naar https://github.com/mdeletter/practicalgit en maak een Pull Request aan
62. OEFENING 2 • git checkout master • maak een nieuwe branch aan: feature/a • Voeg de tekst ‘A’ op regel 2 van de README.md • Commit de wijzigingen • Maak een 2e branch aan: feature/b vanaf master • Voeg in deze branch ook op regel 2 de tekst ‘B’ toe en commit de wijzigingen • git checkout master, en merge eerst feature/a en vervolgens feature/b terug
63. OEFENING 3 • maak een nieuwe branch aan: feature/c • voeg 1 regel toe in de README.md, commit deze wijziging. • Doe dit 5 keer, zodat je 5 commits heb in deze branch. • Pas de commit history aan, zodat je 2 commits overhoud (samenvoegen). • git rebase -i HEAD~5
64. GIT PROBLEMEN OPLOSSEN
65. GIT PROBLEMEN OPLOSSEN • Op basis van jullie projecten • Waar lopen jullie tegen aan • Hoe zien de commits eruit • Welke git workflow wordt er gebruikt • Wat kan je verbeteren..