~/talk

Git Branching Model

TalkinItalianat phpday PUG Edition 2021 · on Thursday, 2021-03-18· [developer-experience]
links:none on file
slides:none on file

Describes branch-organization strategies for Git: recommends using git-flow for packaged releases but finds it too heavy for continuous-delivery e-commerce and proposes two alternatives—a simplified git-flow and an environment-tied “liscio flow” that map branches to staging/test/production. Advises tooling (GitHub, GitLab, Bitbucket and trackers like Jira, Trello, ClickUp, Teamwork) and gives ten practical rules including running tests per commit, protecting main, using pull requests, tagging releases manually, referencing task IDs in commits, writing intentful messages, keeping a changelog, and not deleting important branches.

AI-written summary · about

  1. 0:00Introduction
  2. 2:14Git branches
  3. 6:10Git Flow
  4. 10:08Git Flow pros and cons
  5. 14:22Git Flow for small projects
  6. 16:11Trunk Flow for environments
  7. 20:09Choosing the model
  8. 23:21Repo rules
  9. 31:45Q&A
  10. 42:58Summary
~/search
type to search 6,249 conferences, 138,987 speakers and 185,172 talks
~/help
cmdctrl k
search every conference, speaker and series
/
focus the filter search
h
home
c
conferences
s
speakers
e
series
t
light / dark — the status bar button does the same
?
this help
esc
close this, then clear every filter — or just the search, while you are typing in it

Ignored while you are typing. Pages without a filter rail have no search to focus.