How Do I Resolve Local Code File Conflicts?

Symptom

On the details page of an MR, the message Unresolved is displayed.

Analysis

The same file is modified by two users and a conflict is reported when an MR is merged.

Solution

1. Update the code and switch to the source branch of this MR.

   git fetch origin 
   git checkout -b feature_010 origin/feature_010

2. Merge the target branch into the source branch.

   git merge origin/master

3. Manually resolve conflicts locally as prompted.
4. Commit code to the remote repository after conflicts are resolved.

   git add . 
   git commit -m'Commit information'
   git push origin feature_010

5. Refresh the page and continue to review the MR.