Merge Conflicts

Merge Conflicts

Symptom: You see conflict files after Sync or Merge.

Do this:

1. Open Merge Changes / conflict helper.
2. For each file, choose:
   • Keep Mine — Use your version
   • Keep Theirs — Use the team’s version
   • Edit — Open the file and manually merge
3. Save after all conflicts are resolved.
4. Share the merged result.

Tip

Conflicts are normal in shared projects. Resolve slowly and verify critical files before sharing.