tk-merge-conflict

What it does: This skill helps fix conflicts that pop up during git operations like merging branches, rebasing, cherry-picking, or reverting changes, when two sets of code changes clash and cannot be combined automatically. It carefully looks at the project's history, the conflicting files, and the goals behind each change before deciding how to resolve them, instead of just guessing. It refuses to guess when the right answer is not clear, and it will not finish or continue the operation until it has proven the conflict markers are gone, the fix is saved and staged, and relevant checks pass. It writes up a clear record of what it found and what it did. When to use it: - You are in the middle of a git merge, rebase, cherry-pick, or revert and see conflict markers in your files - You want the conflict resolved based on real evidence from the project's history, not a random guess It does nothing if there is no active conflict happening, and it is not meant for regular, everyday file edits outside of these operations.