Git - Monterail style

Transcript

1. GIT MONTERAIL STYLE © Tymon Tobolski, 2015

2. Note about the language ... © Tymon Tobolski, 2015

3. BASICS © Tymon Tobolski, 2015

4. COMMIT FLOW © Tymon Tobolski, 2015

5. BRANCHING © Tymon Tobolski, 2015

6. PROTIP: NEW BRANCH $ git branch feature $ git checkout

   feature is the same as $ git checkout -b feature © Tymon Tobolski, 2015

7. MERGING © Tymon Tobolski, 2015

8. PUSH & PULL © Tymon Tobolski, 2015

9. CONFIGURATION $ git config --global user.name "Tymon Tobolski" $ git

   config --global user.email "tymon.tobolski@monterail.com" © Tymon Tobolski, 2015

10. ~/.gitconfig [user] name = Tymon Tobolski email = tymon.tobolski@monterail.com [rerere]

    enabled = true [github] user = teamon [alias] st = status ci = commit co = checkout br = branch ph = push pl = pull [core] excludesfile = /Users/teamon/.gitignore_global [push] default = simple © Tymon Tobolski, 2015

11. PROTIP: ALIASES # .gitconfig [alias] st = status ci =

    commit co = checkout br = branch ph = push pl = pull # later in shell $ git co feature/JIRA-123 © Tymon Tobolski, 2015

12. .gitignore (RAILS APP) # Ignore bundler config. /.bundle # Ignore

    the default SQLite database. /db/*.sqlite3 /db/*.sqlite3-journal # Ignore all logfiles and tempfiles. /log/*.log /tmp # Ignore personal setup /config/database.yml © Tymon Tobolski, 2015

13. ~/.gitignore_global (SYSTEM WIDE) # Logs and databases *.log *.sql #

    OS generated files .DS_Store .DS_Store? ._* .Spotlight-V100 .Trashes Icon? # Ruby stuff .ruby-version .rbenv-version .rbenv-vars # and more ... © Tymon Tobolski, 2015

14. ~/.gitignore_global SETUP $ git config --global core.excludesfile ~/.gitignore_global REFERENCES ▸

    http://islegend.com/development/setting-global-gitignore-mac-windows/ ▸ https://help.github.com/articles/ignoring-files/#create-a-global- gitignore © Tymon Tobolski, 2015

15. PROTIP: PROMPT google "git bash prompt" © Tymon Tobolski, 2015

16. COMMIT MESSAGE [JIRA-123] Capitalized, short (50 chars or less) summary

    More detailed explanatory text, if necessary. It can span multiple lines. [skip ci] github.com/monterail/guidelines/blob/master/git.md © Tymon Tobolski, 2015

17. Write present-tense, imperative-style commit messages GOOD: [JIRA-123] Add currency service

    BAD: [JIRA-123] Adds currency service BAD: [JIRA-123] Added currency service © Tymon Tobolski, 2015

18. If commit is for some reason not assigned to any

    ticket, we use following tags: [fix] Changes fixing code not assigned to issue [docs] Changes of documentation, not affecting code [style] Changes that do not affect the meaning of the code [refactor] Changes that affect code, but not behavior of app [perf] Changes that improve performance [test] Adding missing tests [chore] Other, usually boring or repeating tasks © Tymon Tobolski, 2015

19. REBASE © Tymon Tobolski, 2015

20. "MERGE HELL" © Tymon Tobolski, 2015

21. CASE 1 TWO DEVELOPERS WORKING ON THE SAME FEATURE ©

    Tymon Tobolski, 2015

22. merge rebase © Tymon Tobolski, 2015

23. CASE 2 MERGING MULTIPLE FEATURES © Tymon Tobolski, 2015

24. merge rebase © Tymon Tobolski, 2015

25. REBASE © Tymon Tobolski, 2015

26. REBASE Getting up to date with master $ git checkout

    feat/abc $ git rebase master Merging feature into master $ git checkout master $ git merge --no-ff feat/abc © Tymon Tobolski, 2015

27. PROTIP: GIT UP $ gem install git-up $ git up

    master up to date feature/ABC-123 rebasing... feature/ABC-456 fast-forwarding... preprod up to date github.com/aanand/git-up © Tymon Tobolski, 2015

28. QUESTIONS? © Tymon Tobolski, 2015