GIT Versioning - From Padawans to Jedis

An overview about GIT version control and an introduction of how to use it correctly, presented at PUC Padawan's MeetUp group.

Transcript

1. GIT VERSIONING FROM PADAWANS TO JEDIS
2. VERSIONING B.C.
3. GIT VERSIONING - FROM PADAWANS TO JEDIS ZIP/FOLDER BASED VERSIONING
4. GIT VERSIONING - FROM PADAWANS TO JEDIS NETWORK SHARED PROJECT FOLDER
5. A.D. VERSIONING
6. GIT VERSIONING - FROM PADAWANS TO JEDIS VERSION CONTROL SYSTEMS
7. WHAT IS VCS?
8. GIT VERSIONING - FROM PADAWANS TO JEDIS VCS - VERSION CONTROL SYSTEM Revision Control, also know as version control and source control, it’s a software to manage different versions in the development of any document. This systems are generally used in the development of softwares to control the version during the software lifetime and keep a history of the modifications made by the development team.
9. GIT VERSIONING - FROM PADAWANS TO JEDIS VCS - VERSION CONTROL SYSTEM - SOME OF THEM ▸ Concurrent Versions System (CVS) ▸ Subversion (SVN) ▸ GIT ▸ BitKeeper ▸ Mercurial ▸ 100’s of others…
10. GIT
11. WHY GIT?
12. GIT VERSIONING - FROM PADAWANS TO JEDIS WHY GIT? ▸ Free and Open Source ▸ Simple usage ▸ Small and Fast ▸ Decentralised and distributed ▸ Excellent branching and merging models ▸ Data Assurance
13. GIT VERSIONING - FROM PADAWANS TO JEDIS WHY GIT? ▸ Designed for little and big projects ▸ Strong Support for non-linear development ▸ GUI Tools
14. HISTORY
15. LINUS TORVALDS CREATED BY
16. THE LINUX KERNEL USED TO MANAGE
17. HTTP, FTP, RSYNC, SSH, GIT FIRST MULTI- PROTOCOL
18. JUNIO HAMANO MAINTAINED BY
19. GIT FOR PADAWANS
20. INSTALLING GIT
21. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FOR PADAWANS - INSTALLING GIT ▸ Fedora based: sudo yum install git-all ▸ Debian based: sudo apt-get install git-all ▸ OSX: XCode Tools ▸ Windows: Binary package ▸ From Source: PLAY HARD!
22. COMMAND LINE
23. CONFIGURING
24. GIT VERSIONING - FROM PADAWANS TO JEDIS CONFIGURING
25. REPOSITORIES
26. GIT VERSIONING - FROM PADAWANS TO JEDIS REPOSITORIES - CREATING A NEW REPOSITORY
27. GIT VERSIONING - FROM PADAWANS TO JEDIS REPOSITORIES - CLONING AN EXISTING REPOSITORY
28. COMMIT
29. GIT VERSIONING - FROM PADAWANS TO JEDIS COMMIT - ADDING AND COMMIT A NEW FILE
30. LOCAL AND REMOTES
31. GIT VERSIONING - FROM PADAWANS TO JEDIS LOCAL AND REMOTES - ADDING A REMOTE
32. GIT VERSIONING - FROM PADAWANS TO JEDIS LOCAL AND REMOTES - ADDING A REMOTE
33. PULLING AND PUSHING
34. GIT VERSIONING - FROM PADAWANS TO JEDIS PULLING AND PUSHING - PUSHING UPDATES TO REMOTE
35. GIT VERSIONING - FROM PADAWANS TO JEDIS PULLING AND PUSHING - PUSHING UPDATES TO REMOTE
36. BRANCHES
37. GIT VERSIONING - FROM PADAWANS TO JEDIS BRANCHES A branch in a GIT repository it’s a ramification starting from an origin branch, where you can do changes without elsewhere in the development flow.
38. GIT VERSIONING - FROM PADAWANS TO JEDIS BRANCHES - CREATING A NEW BRANCH
39. GIT VERSIONING - FROM PADAWANS TO JEDIS BRANCHES - CREATING A NEW BRANCH
40. LOG
41. GIT VERSIONING - FROM PADAWANS TO JEDIS LOG - GETTING THE PROJECT LOG
42. TOOLS
43. GUI'S
44. GIT VERSIONING - FROM PADAWANS TO JEDIS TOOLS - GUI'S
45. PROJECT HOSTING
46. GIT VERSIONING - FROM PADAWANS TO JEDIS TOOLS - PROJECT HOSTING
47. FROM PADAWANS TO JEDIS
48. STASH
49. GIT VERSIONING - FROM PADAWANS TO JEDIS STASH - SAVING CHANGES WITHOUT COMMIT
50. ADVANCED BRANCHING
51. MERGE AND REBASE
52. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - MERGE AND REBASE Merge and Rebase are actions performed in GIT repositories to join updates made in a separated branch into another branch.
53. MERGE VS REBASE
54. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - MERGE VS REBASE ▸ Merge: Applies a update block in a destination branch, generating a merge-commit on the top of the development history of that branch. ▸ Rebase: Reapply commits on top of another branch without generate merge-commits.
55. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - MERGE ▸ Pros: ▸ Traceability ▸ More secure ▸ Cons: ▸ Dirty development history
56. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - REBASE ▸ Pros: ▸ Clean development history ▸ Handle just one commit is quite easy ▸ Useful in patches
57. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - REBASE ▸ Cons: ▸ Dangerous ▸ Don’t recommended to use in pull requests ▸ More work ▸ More conflicts
58. MERGING
59. GIT VERSIONING - FROM PADAWANS TO JEDIS ADVANCED BRANCHING - MERGING
60. VERSIONING YOUR PROJECT
61. SEMANTIC VERSIONING
62. GIT VERSIONING - FROM PADAWANS TO JEDIS VERSIONING YOUR PROJECT - SEMANTIC VERSIONING 2.10.6 MAJOR MINOR PATCH
63. GIT VERSIONING - FROM PADAWANS TO JEDIS VERSIONING YOUR PROJECT - SEMANTIC VERSIONING ▸ Increment: ▸ MAJOR: When you make incompatible API changes ▸ MINOR: When you add functionality in backwards- compatible manner ▸ PATCH: When you make backwards-compatible bug fixes
64. USING TAGS
65. GIT FLOW by Vincent Driessen’s
66. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - DECENTRALIZED AND DISTRIBUITED
67. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - REMOTE REPOSITORY MODELLING An organised remote repository generally include two branches: develop and master. In the first (develop), we centralise the development history of the software. In the second (master), we have an stable history of our system
68. GIT VERSIONING - FROM PADAWANS TO JEDIS A SUCCESSFUL GIT FLOW MODEL
69. FEATURE DEVELOPMENT GROWING YOUR APPLICATION
70. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - FEATURE DEVELOPMENT ▸ Define a feature ▸ Ramified from the development branch ▸ Just one developer or team by feature ▸ Allows Continuous Integration ▸ Must be deleted after finished
71. RELEASE FOR PRODUCTION ARE YOU READY ?
72. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - RELEASE FOR PRODUCTION ▸ Ramified from development branch ▸ Release hardening ▸ Minor version increases ▸ Updated the software document and support files
73. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - RELEASE FOR PRODUCTION ▸ Merge ▸ Tag ▸ Package ▸ Release
74. PERFORM A HOTFIX SOMETIMES WE HAVE BUGS
75. GIT VERSIONING - FROM PADAWANS TO JEDIS GIT FLOW - PERFORM A HOTFIX ▸ Ramified from the master branch ▸ Fix ▸ Test ▸ Increase patch version ▸ Merge ▸ Publish
76. HOOKS
77. GIT VERSIONING - FROM PADAWANS TO JEDIS HOOKS - COMMITTING-WORKFLOW HOOKS ▸ pre-commit: used to inspect the current snapshot that’s about to be committed ▸ prepare-commit-msg: used to set a default commit message before the editor is fired up ▸ commit-msg: used to validate the commit message or any other thing before allowing a commit to go through ▸ post-commit: used to perform something after the commit completes, generally used for notification or something similar.
78. GIT VERSIONING - FROM PADAWANS TO JEDIS HOOKS - SERVER SIDE HOOKS ▸ pre-receive: it’s fired when the remote receives the push request and it takes a list of references that are being pushed from stdin. ▸ update: it’s fired for each branch the pusher is trying to update, like the pre-receive, but one for each branch. ▸ post-receive: fired after the push is complete, generally used for notification or something similar.
79. CONCLUSION
80. GIT VERSIONING - FROM PADAWANS TO JEDIS THANK YOU ! Lucas Mendes Lead Engineer at @isetbr
 Head of Product at @2X3 devsdmf@gmail.com
 devsdmf.io
 github.com/devsdmf
 about.me/devsdmf
 twitter.com/devsdmf Slides: bit.ly/devsdmf-puc-pad