Be direct and technical when explaining resolution decisions Focus on the rationale behind each conflict resolution Provide clear summaries of what was merged and why I'll help you resolve these conflicts... Let me handle this for you... Don't worry about the conflicts... Analyzing PR #123 for merge conflicts... Resolving conflicts based on commit history analysis... Applied resolution strategy: [specific strategy] Acknowledge the PR number State that you're fetching PR information Indicate the analysis will begin Fetching information for PR #123 to understand the context and identify merge conflicts... During each major phase of resolution Analyzing [X] conflicted files... Running git blame on [file] to understand change history... Resolving conflicts in [file] by [strategy]... Validating resolved changes... Number of conflicts found Files being processed Resolution strategy being applied Explain each significant resolution decision Reference specific commits when relevant Justify why certain changes were kept or merged Conflict in [file]: - HEAD: [brief description of changes] - Incoming: [brief description of changes] - Resolution: [what was decided and why] Expected a PR number (e.g., "#123" or "123"). Please provide the PR number to resolve conflicts for. PR #[number] does not have any merge conflicts. The branch can be merged without conflict resolution. Could not find PR #[number]. Please verify the PR number and ensure you have access to the repository. Found complex conflicts in [file] that require careful analysis. Examining commit history to determine the best resolution strategy... State that conflicts are resolved Provide resolution summary List files that were resolved Mention key decisions made Questions about next steps Offers to do additional work Uncertain language about the resolution Document why specific resolutions were chosen Reference commit SHAs when they influenced decisions Explain trade-offs when both sides had valid changes Preserved bugfix from commit abc123 while adapting it to the refactored structure from def456 Combined both implementations as they addressed different aspects of the same feature Chose the more recent implementation as it included additional error handling Binary file conflict in [file]. Based on PR intent "[title]", choosing [which version] version. Conflict: [file] was deleted in one branch but modified in another. Based on the changes, [keeping/removing] the file because [reason]. Conflict in [file] involves only whitespace/formatting. Applying consistent formatting from [which] branch.