Philosophical Git

Transcript

1. git \ˈgit\ An unpleasant or contemptible person.
2. What is wrong?
3. Lack of consistency What is wrong?
4. No team standard What is wrong?
5. As a whole, we have a solid technical understand of git. We should be able to collaborate to determine a solution for our issues. “The first step towards amendment is the recognition of error.” - Seneca
6. Common Issues • Merge conflicts. • Super branches are the devil and should be avoided at all costs. • Engineer side conversations about branches that are not publicly announced. • Lack of breaking down large tasks into small more consumable tasks.
7. Common Issues We live in the world of the feature branch. And in our current state we have the concept of a “master feature branch”. This branch is usually based off of master, with one person committing to it. We then have other developers branching from the “master feature branch” and working on additional features. In order for this to work correctly, the creator of the “master feature branch” will need to take the role of keeping up to date with the upstream (master) and the others branched off should be doing the same, but in their case keeping up with the “master feature branch”.
8. This is a lot of hard work and requires even more side communication to keep things in order. In addition, this process causes engineers to be two removed from master and can case lost commits. Our current process is wrong. Common Issues
9. Ideality Concise, short lived, feature branch based off of master. “Only the descent into hell of self-knowledge can pave the way to godliness.” - Immanuel Kant
10. Git Flow 1. Create a Branch 2. Add Commits 3. Open a Pull Request 4. Code Review and Discussion 5. Merge and Deploy[1] references: https://guides.github.com/introduction/flow/ 1. Master should always be our upstream. Master is our stable release branch, everything on master is considered production ready.
11. Believe in the process • There are many schools of thought on how to handle the git process. • Find one that works for us and follow it. • If we have a process we believe in, we will be successful. • Stand by the process and bring attention when things are not in order.
12. Summation Small features. No merge conflicts. Profit. “All wealth is the product of labor.” - John Locke