Version Control tips, tricks and good citizenship
summary
Advice focuses on concrete fixes: use SVN or Git features (stash, cherry‑pick, multiple working copies), run PHP CodeSniffer and PSR-2 as pre‑commit checks, wire pre‑ and post‑commit hooks to enforce reviews and build changelogs, integrate with Jenkins/GitLab/Bitbucket for notifications, and habitually merge up from stable every day to avoid missing-file and add/delete conflicts. Claim: automated hooks plus clear branching and enforce commit message patterns reduces merge time; example tools and workflows are shown and proven in live teams.
AI-written summary · about
chapters (35)
- 0:00Intro
- 0:56Tess Barnes
- 2:54Basic levels
- 3:22Bonus levels
- 4:36Minor conflict resolution
- 6:12Interleaved causes
- 9:21Fixing add conflicts
- 12:39Fixing delete conflicts
- 13:42Missing files trying to apply change to non existent file
- 15:12Avoiding missing files
- 16:01here's why
- 17:20Get out of jail free
- 18:53Why just fix?
- 20:22VC tree bonsai
- 22:44Branching strategy
- 24:07Coping with complexity
- 25:46Script Examples
- 27:47What is a hook?
- 29:14Why enforce authorisation
- 30:42Authorisation solutions
- 31:16What if you use git?
- 32:01Enforcing code review two heads are better than one
- 32:24Why use tools with this?
- 33:25How do we automate?
- 35:04Getting outside help
- 36:23Enforcing standards making it easier to handle... HUNDREDS OF LINES OF CODE
- 38:05TortoiseSVN example
- 39:03server hook example
- 40:21Creating change logs the lazy way
- 40:34Lazy change logs
- 42:19Validate commit messages Check min length Pattern match
- 43:30scrape details from svn log
- 44:53Publish those logs
- 45:19Keep everyone in the loop
- 45:46Start a revolution
related talks
27mModern Source and Version Control with Git
29mFearless DevOps: Committing to Code
47mTales from the Dev Side: What Went Wrong, What We Fixe & What You Can Steal
32mContinuous Integration and Deployment: Five Lessons Learned
01h 29mBetter Code and Collaboration through Open Source Concepts, Dev Containers....
43mGit stories from the front line
38mContinuous Integration May Have Negative Effects
24mSo you think you know Git. Advanced Git Tips and Tricks