Git - Flow

Git flow, branching etc, for Totango

Transcript

1. Git - Flow Ran Tavory Totango Tuesday, June 10, 14
2. Text http://pcottle.github.io/learnGitBranching/?demo Tuesday, June 10, 14
3. Branching Tuesday, June 10, 14
4. Branching Tuesday, June 10, 14
5. Branching - Merging (fast forward) Tuesday, June 10, 14
6. Branching - Deleting Tuesday, June 10, 14
7. Branching cont Tuesday, June 10, 14
8. Branching - Merging (3 way merge) Tuesday, June 10, 14
9. Branching - Management Tuesday, June 10, 14
10. Branching - Remote Tuesday, June 10, 14
11. Branching - Remote Tuesday, June 10, 14
12. Branching - Remote Tuesday, June 10, 14
13. Branching - Remote git pull == git fetch && git merge Tuesday, June 10, 14
14. Branching - Pushing Requires tracking Tuesday, June 10, 14
15. Deleting Remote Branches Tuesday, June 10, 14
16. Pull Requests Tuesday, June 10, 14
17. Creating a Pull Request 1 2 3 4 Tuesday, June 10, 14
18. Reviewing a Pull Request Tuesday, June 10, 14
19. Merging Pull Request Online Tuesday, June 10, 14
20. Merging Pull Requests Offline •Resolve Conflicts •Test •Improve Tuesday, June 10, 14
21. Deleting Branch After PR Merge Tuesday, June 10, 14
22. The Flow Tuesday, June 10, 14
23. 1. Create a Branch git co -b bug-157 Branch Naming: bug-xxx feature-yyy wip-zzz Tuesday, June 10, 14
24. 2. Add Commits Commit messages are super important!!! Tuesday, June 10, 14
25. 3. Open a Pull Request Make sure you assign a reviewer! Tuesday, June 10, 14
26. 4. Discuss AKA Code Review Continue to commit and push. This will be reflected Tuesday, June 10, 14
27. 5. Merge Merge means: It’s good for production. master is always deployable Tuesday, June 10, 14
28. Pull Request Demo Tuesday, June 10, 14
29. Code Review Tuesday, June 10, 14
30. Code Review Tuesday, June 10, 14
31. Code Review Golden Rules • Assign author • Determine ownership • Not managers. Peers. • Review ASAP. Same day. • Highest priority, after prod • Refer to Coding Guidelines (Java, Javascript, Python) • 200 - 400 LOC Max. 400 LOC = 1 hour • Verify that defects are actually fixed! Tuesday, June 10, 14
32. Code Review What to look for • Reusability • Is the code in the right location in the codebase? • Style guidelines • רבישה קוח • Coupling and Cohesion • Are the loops bounded? • Is the number of I/O operations minimized? • Is the code metered? • Is the code tested? • Each public method must have a few unit tests. • ... and there’s more... Tuesday, June 10, 14
33. Extra Tuesday, June 10, 14
34. Conflicts Tuesday, June 10, 14
35. Conflicts Edit Collision # Edit file and then $ git add $ git commit Tuesday, June 10, 14
36. Conflicts Removed File Tuesday, June 10, 14
37. Conflicts Removed File - Keep Tuesday, June 10, 14
38. Conflicts Removed File - Remove Tuesday, June 10, 14
39. Conflicts Git Mergtool • Not covered here... • http://git-scm.com/docs/git-mergetool Tuesday, June 10, 14
40. Conflicts While Rebasing Tuesday, June 10, 14
41. Refs https://help.github.com/articles/resolving-a-merge- conflict-from-the-command-line http://pcottle.github.io/learnGitBranching/ http://jeffkreeftmeijer.com/2010/the-magical-and-not- harmful-rebase/ https://help.github.com/articles/using-pull-requests https://help.github.com/articles/creating-a-pull-request http://en.wikipedia.org/wiki/ Coupling_(computer_programming) Tuesday, June 10, 14