Loading...
Loading...
Found 3 Skills
Use when resolving non-trivial merge conflicts, choosing a merge strategy, or undoing a merge — covers -X options, diff3 markers, strategy vs option, reset vs revert -m, and re-merging reverted branches
Undo the last commit while keeping changes staged. Use when you need to fix a commit message or add missing files.
Reset the working directory for the next task by ensuring no uncommitted changes exist, then switching to the main branch and pulling latest.