Recommended
More Related Content
Similar to Do you really understand Git?
Similar to Do you really understand Git? (20)
More from ESUG
More from ESUG (20)
Recently uploaded
Recently uploaded (20)
Do you really understand Git?
- 1. Do you really understand Git? 本当に分かる？ by Guille Polito, Pablo Tesone @GuillePolito, @Tesonep Evref fervE
- 2. Why ? • Visibility • Manage more than only code • Lower entry barrier into the community • Lots of exis ti ng tools • Good branch support, good di ff • …
- 3. Where would you place yourself?
- 4. Where would you place yourself?
- 5. Where would you place yourself?
- 6. Where would you place yourself?
- 7. A Test $ How do you **clean** your working copy?
- 8. A Test $ git reset How do you **clean** your working copy? This will reset your index
- 9. A Test $ git reset --hard How do you **clean** your working copy? Well, yes, but not quite. This will reset your working copy. But not remove untracked fi les.
- 10. A Test How do you **clean** your working copy? $ git reset --hard $ git clean -fd
- 11. is not easy • New terminology: index, HEAD, pull, push, fetch • False friends: merge, commit • Command-line oriented • Documenta ti on is some ti mes ambiguous, some ti mes incomplete
- 12. is not easy (2) • Mul ti ple work fl ows are a two-edged machete There is no One, single ring to rule them all • People mix work fl ows, philosophy and technical solu ti ons (try reading some blogs…) • Graphical tools are too general or too speci fi c
- 13. An easy way to 1. It’s a graph! 2. It’s a two-stage database!
- 14. as a Graph b8bfed7 7ba52e5 35ac17f a4153b1 b01aba4 feature_branch master_branch v1.0 <tag> HEAD parent reference Labels: ti me moves in this direc ti on
- 25. merge fast-forward parent reference Labels: 37adf4e 0c0e5ff development dc4a3e7 master HEAD ti me moves in this direc ti on
- 26. as a 2-stage Database Working Copy Index Repository What you see Where commits are A “hidden” staging area (sort of) Remote repositories
- 27. add Working Copy Index Repository
- 28. commit Working Copy Index Repository
- 29. checkout Working Copy Index Repository
- 30. fetch Working Copy Index Repository
- 31. push Working Copy Index Repository
- 32. pull? $ git fetch $ git merge
- 34. + Just makes it harder • Image-based persistence • Files vs packages • Mon ti cello adds more false friends!
- 35. The 4 ti ps of the Iceberg
- 36. Show the “Good” Path
- 38. Guide out of the Darkness
- 39. Use a Clear Language workingCopy commitWithMessage: ‘message’. aRepository head. aBranch pull.
- 40. Iceberg’s Working Copy • A repository has an in-image working copy • A working copy remembers its current commit • Required for pulling, pushing, di ffi ng... Pharo Image Iceberg Working Copy commit=dc4a3e7
- 41. Dual Working Copy Working Copy Repository … To be able to work, the working copy should be in-sync with the working copy in disk Pharo Image Iceberg Working Copy commit=dc4a3e7 commit=dc4a3e7
- 42. Detached Working Copy Working Copy Repository … The working copy in the image can get desync from the working copy in disk Pharo Image Iceberg Working Copy commit=dc4a3e7 commit=0c0c5ff
- 43. Why do I get Detached Working Copy? Although quite rare: • Possibility 1) You touched your git repository from outside the image • Possibility 2) Your image crashed in between commits • Possibility 3) You forgot to save your image a ft er a commit
- 44. How do I get out of Detached Working Copy? • Op ti on 1) Move your image to your repository state (load what is in the disk) • Op ti on 2) Move your repository state to what is in the image (checkout image’s commit) • Op ti on 3) Try merging both
- 45. Takeovers • Git is the assembly of version control • But you need to know the internals • commit graph and references • working copy, staging area • Iceberg deals with image-based persistency