Skip to content

bikeindex/bike_index / .claude/skills/merge-conflicts

merge-conflicts

Verified

How to bring a branch up to date and resolve git merge conflicts the way this repo expects — merge (never rebase or force-push), understand each side's intent before choosing, ask when a resolution isn't clear-cut, keep the merge commit to just the merge, and audit what merged *cleanly* before committing. Trigger whenever you're about to run `git merge`/`git pull`, sync a branch with `main`, "update from main", or resolve conflict markers left by a merge, cherry-pick, or interrupted pull — including bare phrasings like "fix the conflicts", "merge main in", or "this branch is behind". Not for merging data/files (PDFs, CSVs) or algorithms (merge sort) — this is strictly about git branch integration.

Security report

Verified

Static analysis of one exact version. It reduces risk and shows evidence; it does not certify that a skill is safe.

Commit
2dc621a95968a0c330429eaec2980da6e1c60ba2
Content hash
59b838ee78d892bf81c134e3252f6ed50d4dd5584a01ee2b27485cad919a669b
Scanned
2026-11-17
Scanner version
skillxone-scan-1.0.0
Policy version
0.1-draft
Decision
Every required check completed with no open blocking or medium findings.
Verification expires
2026-12-17

Findings (1 info)

  • infoINT-BROAD-ALLOWED-TOOLSSKILL.md:14

    SKILL.md pre-approves unrestricted shell access through `allowed-tools`, so the agent may run commands without asking.

    allowed-tools: Bash, Read, Edit, Write, Glob, Grep

    Suggested fix: Restrict the tool, for example `Bash(git status:*)`, or leave approval to the user.

    Report as false positive

Checks run

  • prompt-injection
  • dangerous-commands
  • credentials
  • network
  • file-access
  • integrity

Checks skipped

  • dependencies: No dependency manifest in the skill directory.
  • gitleaks: gitleaks is not installed on this host.
rea-analysis-optimizationmorluto/reaOptimize REA providers and shared analysis workflows for agent context, latency, CPU, and memory while preserving correctness and Evidence. Use for analysis bottlenecks and cache or query design; CI/test-suite optimization belongs to rea-ci-tests-audit.Stars: 472kUpdated Claude CodeCodexVerifiedInstall
rea-ci-tests-auditmorluto/reaAudit REA CI and test suites for correctness, fixture drift, false passes, and measured performance; use for suite or workflow investigations and efficiency changes, rather than ordinary feature testing or a single test failure.Stars: 472kUpdated Claude CodeCodexVerifiedInstall
rea-tool-designmorluto/reaAudit, investigate, design, or change REA investigation tools, CLI/MCP contracts, provider capabilities, and Evidence semantics.Stars: 472kUpdated Claude CodeCodexVerifiedInstall
ponytail-auditDietrichGebert/ponytailQuality audit of the whole repo: bugs, security, real load, missing tests, speed, and what to delete. Most important first.Stars: 194kUpdated Claude CodeCodexVerifiedInstall