[dev-hours] Github-flow f.t git-flow

Transcript

1. ~ $ echo "svn or subversion" | sed 's/svn\|subversion/git/g'
2. ~$ whoami
3. Stable, stable, stable … Environment (local, dev, staging, production) Stable branch? Who, How  deploy source code  QA Env? Who, How  deploy source code  Production Env? Happiness??
4. 1 trunk -> unstable -> ?? 1 tags/latest -> stable ->?? Trouble?? Test Before You Commit? Conflict?? -> sh!tass-min -> resolved Diff, blame, resolve conflict?? Revert code?
5. Github-flow Git-flow Svn-flow Any-flow
6.  Anything in the master branch is deployable  To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)  Commit to that branch locally and regularly push your work to the same named branch on the server  When you need feedback or help, or you think the branch is ready for merging, open a pull request  After someone else has reviewed and signed off on the feature, you can merge it into master  Once it is merged and pushed to ‘master’, you can and should deploy immediately
7. Create a branch for feature, module, fix bug, ideal…
8. Add files and commits
9. Push code and Open a Pull Request/Merge Request
10. Discuss and review your code
11. Merge and deploy
12. Bitbucket
13. Git-flow?