Poor Man's Merge Conflict Resolver
One habit I am building is converting repetitive tasks into Claude Slash Commands. Even though I do not write code by hand anymore, I still direct and architect how the critical parts of the codebase are written. When it comes to frontend, it’s mostly vibe-coded without looking inside. Part of this involves resolving merge conflicts. I am sharing that slash command below in the hope that it will be useful to others. ...