# Specsfy Specialist Merge Conflict Resolution

> Resolver conflitos Git de merge ou rebase pela intenção de cada lado, preservando comportamento e…

Resolver conflitos Git de merge ou rebase pela intenção de cada lado, preservando comportamento e validando integração. Use quando já existe operação com arquivos unmerged; não abortar, reescrever histórico remoto ou escolher um lado inteiro sem autorização.

- Page: https://ss33.ai/skills/promovaweb/specsfy-specialist-merge-conflict-resolution-90621408189
- Publisher: promovaweb
- Category: [Software Development](https://ss33.ai/skills/category/software-development-t44z8z) › [Source control & code review](https://ss33.ai/skills/category/software-development-t44z8z/source-control-and-code-review-jebezw)
- Source: https://github.com/promovaweb/specsfy/blob/7d7f9767f8bd678b24294d76a015feba5026a8c3/example/.agents/skills/specsfy-specialist-merge-conflict-resolution/SKILL.md

## Skill

This skill's licence does not allow redistribution, so the store does not serve its text. Get it from the author: https://github.com/promovaweb/specsfy/blob/7d7f9767f8bd678b24294d76a015feba5026a8c3/example/.agents/skills/specsfy-specialist-merge-conflict-resolution/SKILL.md