Review Conflict Resolution

Review the conflict resolution that the user has made during a rebase or merge operation.

Language

Respond in the same language the user is using. Match the user's language for all output.

Important

• You are NOT resolving conflicts - the user has already resolved them
• Your job is to REVIEW the resolution and identify potential issues
• Understanding the CONTEXT of why conflicts occurred is crucial for a good review

Steps

1. First, check the current git status to understand the state: