Skip to content

Instantly share code, notes, and snippets.

@changhsinlee

changhsinlee/main.md

Last active June 18, 2019 12:31
Show Gist options
  • Save changhsinlee/7e49ab4fcf0f2a1d3c00c85b0064d3c9 to your computer and use it in GitHub Desktop.
Save changhsinlee/7e49ab4fcf0f2a1d3c00c85b0064d3c9 to your computer and use it in GitHub Desktop.
Download ZIP
Git development styles
Raw
main.md

Mainline vs GitFlow https://www.toptal.com/software/trunk-based-development-git-flow

https://news.ycombinator.com/item?id=13514289

cygned on Jan 29, 2017 [-]

We currently use short-lived feature branches, merged via Pull Requests (+ review / automated testing) into the main development line. This way, we can communicate changes in a detailed manner before they are added to the product and make sure there is no unfished or bad code in the main branch. (The dev team is small, 5-8 devs). I don't see (yet?), what benefits TBD would provide in such a setup.

Write documentation, not code, in the workshop

Make a workshop_dev branch, then base the changes off that branch

Scenario:

  • Working on the functionality of the front end, while getting a emergency request that a backend issue needs to get fixed

My strategy: checkout a new branch off dev to work on the backend issue. After it's done, then pull the changes off dev into the front end feature branch I'm working in.

Simulate in workshop: after the attendees have been working on the documentation for 10 minutes, ask them to stop and "fix something"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment