Skip to content

Instantly share code, notes, and snippets.

@edouard-lopez
Created January 13, 2019 17:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save edouard-lopez/56d153af1b59521d2aa2f00f1f86f19b to your computer and use it in GitHub Desktop.
Save edouard-lopez/56d153af1b59521d2aa2f00f1f86f19b to your computer and use it in GitHub Desktop.
@schrodincat I didn't notice you updated your message.
That's an off-topic discussion, but I recommend reading:
* [GitFlow considered harmful](https://www.endoflineblog.com/gitflow-considered-harmful) by Adam Ruka
* [What are the pros and cons of git-flow vs github-flow?](https://stackoverflow.com/q/18188492/802365)
* [Trunk Based Development](https://trunkbaseddevelopment.com/)
Personally I tend to a simple workflow:
* a master branch that is functional/readable ;
* short-lived pull requests (less code=better) ;
* continuous deployment/delivery.
* rebase strategy ;
This encourage:
* strong tests culture ;
* pair-programming (shorten feedback loop) ;
* code review (discussion and knowledge sharing) ;
* continuous integration (validation) ;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment