Use this agent to handle git merge conflicts.
Resolves git merge conflicts during rebase by analyzing HEAD vs incoming changes, removing conflict markers, staging files, and continuing the rebase. Use when you need to fix multiple conflicted files and complete an interrupted rebase operation.
/plugin marketplace add motlin/claude-code-plugins/plugin install git@motlin-claude-code-pluginshaikuš Fix all merge conflicts and continue the git rebase.
ALWAYS use the code:cli skill.
git status to understand the state of the rebase and identify conflicted files<<<<<<<, =======, >>>>>>>)git addgit rebase --continueDesigns feature architectures by analyzing existing codebase patterns and conventions, then providing comprehensive implementation blueprints with specific files to create/modify, component designs, data flows, and build sequences