Git VCS - Talk @PHP User Group Malang, March 9 2015

Git - Open Source, Distributed, Speedy, and Efficient version manager.

Transcript

1. GIT VCS @achmadmahardi
2. Achmad Mahardi • Frontend Devs • Server side languages (PHP, NodeJS, C#) • Unix aficionados
3. GIT Open Source - Distributed - Speedy - Efficient -
4. *is • (almost) Everything local • No network needed • Immutable
5. • Backup tool • Binary file storage/diff/apapun • Github/Bitbucket/apapun *is not
6. INSTALASI
7. msysgit   built-in / brew  install  git   apt-­‐get  install  git  /  yum  install  git pkg_add  -­‐r  git via ports /  donlot source, kompel dewe
8. FIRST STEPS
9. git  config  -­‐-­‐global  user.name  "..."   git  config  -­‐-­‐global  user.email  "..." git  config  user.name  "..."   git  config  user.email  "..." ~
10. git  config  -­‐-­‐global  color.ui  true
11. *optional* ENVARS •  EXPORT  PAGER=less   •  EXPORT  EDITOR=nano
12. GETTING STARTED
13. git  init Membuat repository baru
15. git  status Melihat status repository
16. git  add Masukkan/track file ke repository
17. *gitignore •  curl  -­‐L  -­‐s  https:// www.gitignore.io/api/ $LANG   • binary files • autogenerated files • autogenerated folders
18. git  commit Fix-kan perubahan, catat history (delta)
19. *commit convention • Jelaskan perubahan • Singkat padat jelas • Max 50 karakter/line
20. *commit convention -cont •  curl  -­‐L  http://git.io/xTwk   • GitHub specific syntaxes
21. SYNC& REMOTES& BRANCHES. github.
22. mabes open source forex IB client area. vagrant, PHP5, bootstrap + LESS
23. git  remote mengatur referensi ke remote repo add  <name>  <url>   rm  <name>   rename  <old>  <new>
24. git  fetch import commit dari remote ke local
26. git  fetch import commit dari remote ke local
27. git  merge Merge changes dari remote-referenced branch ke master branch kita
28. *merge vs rebase • merge = direct merging • rebase = prevent unnecessary git  config  -­‐-­‐global  branch.autosetuprebase  always
29. *mengenai git pull • fetch + merge • --rebase = fetch + rebase
30. git  push export commit dari local ke remote ➜
31. git  branch manajemen branch.
32. branching
37. fast-forward merge
38. 3-way merge
39. *github • fast-forward merge otomatis • close issues via commit message • integration (travis, scrutinizer, slack, ...)
40. DEVELOPMENT PRACTICES advanced chapter
41. • sering sering commit & resync • three-tier development (dev, staging, prod). • patuhi commit convention / buat commit convention u/ team. • gitignore, .gitignore, .gitignore
45. &
47. *+++ • isolated • through-testing • rolling-release • lebih gampang u/ revert
48. *lagi? • https://speakerdeck.com/ schacon/introduction-to-git • https://speakerdeck.com/ holman/more-git-and-github- secrets • https://www.atlassian.com/git/
49. /maman /achmadmahardi  /Achmad.mahardi Pertanyaan/Diskusi?  Malang PHP User Group