Walk me through your step-by-step process for resolving a merge conflict.

Resolving merge conflicts involves a structured process:

1. Identify Conflicted Files: Git lists conflicted files. Run git status to view files marked both modified.
2. Open Files & Inspect Conflict Markers: Locate the standard Git conflict markers in the source file:

   <<<<<<< HEAD
   Changes on the current active branch (e.g., main)
   =======
   Changes from the branch being merged in (e.g., feature)
   

3. Edit Content: Manually edit the files to combine or select the desired changes, and remove all conflict markers.
4. Stage Files: Stage the resolved files: git add <file-name>.
5. Commit Resolution: Complete the merge operation: git commit -m "merge and resolve conflicts".