
Direct Commits to master Will Haunt You on Deploy Day
One Swagger refactor committed straight to master caused a 3-way merge conflict, a silent GitLab API failure, and 30 minutes of manual branch surgery before we could ship. Here is the full incident and the rule that prevents it.




![Fix Git Pull Error: Resolve Unstaged Changes with git stash [Step-by-Step]](https://cdn.asepalazhari.com/images/articles/version-control/git-pull-conflict-resolution-with-stash.png)