Lightning Talks from Lauren Billington
summary
A team uses a rebase workflow and a misused git pull causes production master to diverge from the repository because git pull calls git merge so merges rewrite history unexpectedly. The concrete claim is that rebasing locally changes commit hashes, then pulling on prod forces git to search for matching commits and perform awkward merges. The fix is explicit: standardize deployment commands and perform a hard reset prod master to match the repo after resolving conflicts.
AI-written summary · about
related talks
35mStory telling with Git rebase
11m⚡ Lightning Talk: The Merge Conflict - Conflict: Apply-Before-Merge vs. Traditional Continuous Deployment
44mHow to Git Away with Murder
27mModern Source and Version Control with Git
21mFighting Git Workflows
37mConflict resolution
09mLightning Talk: Best Practices on Organizing GitOps Repositories
42mUsing Git like a pro