resolve-conflicts 100/100

Is resolve-conflicts safe to install?

SaferSkills independently audited resolve-conflicts (Agent Skill) and scored it 100/100 (green). The audit ran 55 deterministic rules across Security, Supply Chain, Maintenance, Transparency, and Community; it found 0 high-severity and 0 lower-severity findings. The full rule-by-rule trace and per-finding evidence are below. Free, methodology-open.

CategoryWeightCategory scoreContribution

Securityprompt, exec, net, exfil, eval

35%

100

35.0 pts

Supply chainhash, typosquat, maintainer, lockfile

20%

100

20.0 pts

Maintenancestaleness, pinning, CI

15%

100

15.0 pts

TransparencySKILL.md, perms, README

15%

100

15.0 pts

Communityinstalls, verify, response

15%

100

15.0 pts

Findings & checks · 0 flagged

Securityscore 100 · 0 findings

✓—All security checks passedNo findings in this category for the latest scan.pass

Supply chainscore 100 · 0 findings

✓—All supply chain checks passedNo findings in this category for the latest scan.pass

Maintenancescore 100 · 0 findings

✓—All maintenance checks passedNo findings in this category for the latest scan.pass

Transparencyscore 100 · 0 findings

✓—All transparency checks passedNo findings in this category for the latest scan.pass

Communityscore 100 · 0 findings

✓—All community checks passedNo findings in this category for the latest scan.pass

The primary manifest — the file an agent reads to learn what this artifact does.

skills/resolve-conflicts/SKILL.md · 1 file

skills/resolve-conflicts/SKILL.md2.0 KB · Markdown

description: Rebase the current branch onto the target branch to resolve PR conflicts.

disable-model-invocation: true

Rebase the current branch onto the target branch to resolve PR conflicts.

Steps:

Determine the target branch using the first method that succeeds:

Run gh pr view --json baseRefName,url 2>/dev/null to get the PR's target branch and URL (requires gh and GitHub).
Run git remote show origin 2>/dev/null | grep 'HEAD branch' to detect the default branch from the remote config (works with any git host).
Check which of main, master, or develop exist on the remote with git branch -r.
If none of the above work, ask the user to specify the target branch and stop until they do.

Run git fetch origin to ensure the latest remote changes are available.
Run git rebase origin/<target-branch>.
If the rebase succeeds with no conflicts, confirm to the user and skip to step 8.
If the rebase stops with conflicts:

Run git diff --name-only --diff-filter=U to list conflicting files.
For each conflicting file, read the file and show the conflict markers clearly.
Resolve each conflict by choosing the correct code based on context:
Prefer the incoming change (theirs) if it supersedes the current change.
Prefer the current change (ours) if the incoming change is unrelated.
Merge both sides if both changes are needed.
After editing each file, run git add <file> to mark it resolved.

Once all conflicts are resolved, run git rebase --continue to proceed. If more conflicts arise, repeat step 5.
If at any point a conflict is too ambiguous to resolve safely, run git rebase --abort, explain what was ambiguous, and ask the user to resolve it manually.
Run git push --force-with-lease to update the remote branch.
Report the result: confirm the branch is rebased and print the PR URL if one was found in step 1, otherwise just confirm the branch is up to date with the target.

$ARGUMENTS

resolve-conflicts— agent skill

Is resolve-conflicts safe to install?

Audit the pieces. Scan the whole. Decide.