← All examples

Highlight merge conflict markers

Highlights lines with merge conflict markers in yellow inside the conflict resolution editor.

Code to copy

.blob-code-inner:has-text("<<<<<<<"),
.CodeMirror-line:nth-child(1) {
  /* fallback below targets rendered conflict markers */
}
.blob-code-marker-injected, .conflict-marker-line {
  background: rgba(255,196,0,0.35) !important;
  font-weight: 700 !important;
}

How to use this example

1. Copy the code with the button above.
2. Install JustZix (2 minutes) and open the extension on the target page.
3. Add a new rule matching that page.
4. Paste the code into the rule's CSS panel and save — the effect appears instantly.