Software Development
Resolve Git Conflicts
Conflict resolution flow — understand the local git conflicts, present a resolution plan, and resolve them after the user approves it. Never continues the rebase. Use it when the repo has unresolved conflicts (rebase, merge, cherry-pick) or the user asks to resolve them.
- Publisher / source
- penpot/penpot (found on the CSV list)
- Upstream record
- penpot/penpot
- Version
- Version 1
- Published
- Publication review
- Approved for publication · recorded passed scan 2026-11-03
- Content fingerprint
e766f49025e518d12b5ad0f5db509c0ea6cff876adf70a0ce2719f222181230a