merge-conflicts

Install

Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.

npx agentmarket install skill/vyzn-tech-merge-conflicts

About

No reviews yet. Installed it? Reviews come from verified installers only. How reviews work

Permissions

What this skill can do and what it asks for, from its SKILL.md. Checked Oct 25, 2026.

Tools

No tools found

Secrets

None asked for

Install scripts

None found

What's inside

Skill name

merge-conflicts

Description

Resolve merge conflicts by rebasing. Use when PR mergeable status is CONFLICTING.

License

MIT

Allowed tools

Bash

Instructions

34 lines in SKILL.md · view on GitHub

# Merge Conflict Resolution

## Check Status

```bash
gh pr view <PR_NUMBER> --json mergeable --jq '.mergeable'
```

- **MERGEABLE** → No conflicts
- **CONFLICTING** → Must resolve conflicts FIRST
- **UNKNOWN** → Wait 30 seconds and retry

## Resolve

```bash
git fetch origin main   # or your base branch
git rebase origin/main

# For each conflicting file:
# 1. Find markers: <<<<<<<, =======, >>>>>>>
# 2. Edit to keep correct code
# 3. git add <file>
# 4. git rebase --continue

git push --force-with-lease
```

## Critical

- **Always resolve conflicts BEFORE other changes**
- Use `--force-with-lease` (never `--force`)
- After resolving, verify the build still works

Signals

Stars

0

Forks

1

Open issues

1

Last commit (this folder)

Mar 1, 2026 (8 months ago)

From GitHub (fetched Oct 24, 2026).

Details

License

MIT

Repository

github.com/vyzn-tech/po-agent

First seen

Oct 24, 2026

Last checked

Oct 24, 2026

Source

GitHubgithub-graphql