Over 20 years of professional development, starting in the late 90's using PERL, and then switching my main focus to PHP in 2003. CEO of [DiegoDev Group][ws_diegodev] and PHP Architect. Podcaster on PHPUgly and php[podcast].
- git merge preserves the full story — including the messy parts
- Merge or rebase? The answer depends on what you want your Git history to look like
- Why Leaders Are TERRIFIED Of Being Wrong 🚩
- The PHP Podcast 2026.06.17
- You tried git rebase once, it blew up your teammate's history, and now you only merge





