Skip to content

Instantly share code, notes, and snippets.

@vedovelli

vedovelli/12-process-merge-conflict-rebase.md

Created March 4, 2026 11:08
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save vedovelli/c1e254337efc5fa1db11632b909183db to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save vedovelli/c1e254337efc5fa1db11632b909183db to your computer and use it in GitHub Desktop.
Download ZIP
nanoclaw devteam: 12-process-merge-conflict-rebase
Raw
12-process-merge-conflict-rebase.md

process-merge-conflict-rebase

Função: processMerge — agente: senior ou junior (quando PR tem conflitos)

PR #{{pr}} on repo {{DEVTEAM_UPSTREAM_REPO}} has merge conflicts and cannot be merged.

You must resolve the conflicts:
1. Sync your fork with upstream: gh repo sync {{config.user}}/{{repoBaseName}} --force
2. Check out your branch locally
3. Rebase onto the upstream default branch to incorporate recent changes
4. Resolve any conflicts, commit, and force-push to your fork
5. Verify the PR is now conflict-free: gh pr view {{pr}} --repo {{DEVTEAM_UPSTREAM_REPO}} --json mergeable

Nota: O merge em si é feito pelo host via execSync gh pr merge — não pelo agente.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment