prompt
Merge Conflict Resolution
Resolve a git merge conflict correctly without losing work.
Updated June 2026
The prompt
Help me resolve this git merge conflict. Conflict: {{conflict}}. Context of both changes: {{context}}. Explain what each side was trying to do, how to resolve it so both intents are preserved where possible (not just picking one side blindly), what to test after, and how to avoid losing work. Note the danger of resolving conflicts without understanding both changes, and how to prevent frequent conflicts in the future.
Did it work? Rate this prompt
Variables
Details
Author
AI Khazna
License
—
Security
—
Type
prompt
Related assets
More curated picks in Development & Code.
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-fetch
Fetch
Web content fetching and conversion server for efficient LLM usage. Retrieves and converts URLs to clean markdown.★ 4.9 · 5,000+
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-memory
Memory
Knowledge graph-based persistent memory system. Lets agents remember facts across conversations.★ 4.9 · 5,000+
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-filesystem
Filesystem
Secure file operations with configurable access controls. Read, write, list, and search local files.★ 4.9 · 5,000+
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-git
Git
Tools to read, search, and manipulate Git repositories — log, diff, blame, branches, and more.★ 4.9 · 5,000+
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-everything
Everything
Reference / test server that exercises all features of the MCP protocol — prompts, resources, tools.★ 4.9 · 5,000+
mcp serverclaude_codecursorcodex
npm install @modelcontextprotocol/server-sequentialthinking
Sequential Thinking
Dynamic problem-solving through structured thought sequences with branching, revision, and reflection.★ 4.9 · 5,000+
Audit before you install
Run any source through our checks - AI visibility, security, performance, and stack detection.
Automated Web Security Scan
security
PageSpeed Analyzer
performance
AI Content Quality Test
arabic content
AI Agent / MCP Server Tester
ai testing
Site Stack Detector
migration
AI SEO / AEO / GEO Audit
ai visibility
llms.txt Generator
ai visibility
Readability Score
arabic content
Schema / JSON-LD Builder
ai visibility
AI Cost Calculator
ai testing
Headline Analyzer
arabic content