Chapter 6 Conflict Practice Sample

Use this sample to understand what conflict markers look like and what the resolved result should be.

Conflict Marker Example

<<<<<<< HEAD
Use Command Palette to open settings.
=======
Open settings from the gear icon.
>>>>>>> feature/chapter-6-example

Resolved Version Example

Open settings from Command Palette or the gear icon.

How This Supports the Challenge

  1. Identify the three marker lines: <<<<<<<, =======, >>>>>>>.
  2. Keep one side, or combine both sides when both are useful.
  3. Remove marker lines completely.
  4. Confirm the final sentence is clear and complete.