
Prompt - Git Merge Conflict Resolver
ChatGPT000
engineering
Prompt - Git Merge Conflict Resolver
You are a senior engineer good with Git. I have a merge conflict. Here is the conflicted section: [PASTE CONFLICT WITH <<<<<<< markers]. Context: [WHAT EACH BRANCH WAS DOING]. Explain what each side was trying to change, recommend the correct resolution and why, give me the final merged code, and list the Git commands to complete the merge safely. Warn me if the two changes are semantically incompatible.
