Upgrade to Pro — share decks privately, control downloads, hide ads and more …

How Spendsetter gits

How Spendsetter gits

Behold, Spendsetter's new, improved, and more-refined git process.

8145132ebae0c1f62cdd7b6126d71768?s=128

Bill Israel

January 22, 2015
Tweet

More Decks by Bill Israel

Other Decks in Programming

Transcript

  1. how gits january 22, 2015

  2. None
  3. git flow

  4. git flow github flow

  5. git flow github flow spendsetter flow

  6. git flow github flow spendsetter flow (no, we’re not calling

    it that)
  7. main principles

  8. two main branches

  9. master two main branches

  10. master develop two main branches

  11. master = what’s on prod

  12. master = what’s on prod develop = what’s on stage

  13. work from develop

  14. hotfixes from master

  15. everything is reviewed

  16. all work is tied to a JIRA ticket

  17. work process

  18. update base branch step 1

  19. step 1

  20. git fetch <remote> step 1

  21. git fetch <remote> step 1 git merge <remote>/branch

  22. git pull step 1

  23. git pull step 1 git pull <remote> <branch>

  24. create new branch step 2

  25. step 2

  26. git checkout -b <branch> <base> step 2

  27. <branch> names step 2

  28. <branch> names step 2 feature: delete-campaign

  29. <branch> names step 2 feature: delete-campaign bug: fix-delete-campaign

  30. <branch> names step 2 feature: delete-campaign bug: fix-delete-campaign jira ticket:

    amp-123
  31. do work step 3

  32. step 3

  33. your local env = your business step 3

  34. (maybe consider rebasing?) step 3

  35. open a pull request step 4

  36. open it at any time step 4

  37. indicate status in title step 4

  38. example: [WIP] step 4

  39. ready for review step 5

  40. clear, succinct title step 5

  41. a long-enough description step 5

  42. reviewer needs context step 5

  43. review process

  44. the feedback loop step 6

  45. the feedback loop step 6

  46. the feedback loop step 6 receive feedback

  47. the feedback loop step 6 receive feedback make change or

    explain
  48. the feedback loop step 6 receive feedback make change or

    explain repeat
  49. ready for merge step 7

  50. how to clean up step 7

  51. how to clean up step 7 update base branch

  52. how to clean up step 7 update base branch git

    rebase -i <base>
  53. how to clean up step 7 update base branch git

    rebase -i <base> git push --force origin <branch>
  54. quick note on commit messages step 7

  55. step 7

  56. first line = summary step 7

  57. first line = summary step 7 72 characters, max

  58. first line = summary step 7 72 characters, max present

    tense
  59. first line = summary step 7 72 characters, max present

    tense doesn’t end in a period
  60. step 7

  61. one blank line step 7

  62. one blank line step 7 prose description

  63. one blank line step 7 prose description use github-flavored markdown

  64. one blank line step 7 prose description use github-flavored markdown

    mention relevant JIRA tickets
  65. step 7

  66. Fixes deleting campaigns The resource collection was incorrect on the

    `DELETE` URL for campaigns. It was `campaign` and should have been `campaigns`. Fixes AMP-123. step 7
  67. merge your pull request step 8

  68. goto 1 step 9

  69. how gits questions?