Artifact [5728ce9c7a]

Artifact 5728ce9c7a35d86ca43b0af86030a7c8486e94b237954b36ae194b1fbb73183d:

• File docs/site/content/docs/reference/cli/repo-conflicts.md — part of check-in [d7fd910ffc] at 2026-10-23 21:12:43 on branch main — docs: generate the site's data, CLI reference and llms.txt from the code

  tools/docsgen/engine records one check-in as an artifact, as its derived rows and as the cards of a pull, from a real engine run with fixed inputs. tools/docsgen/conformance turns TestCoverage's report into per-draft and per-requirement data. scripts/gen-cli-docs.sh writes one page per command group from the libfossil binary's --help. gen-llms-txt.sh and check-llms-txt.sh are ported from dagnats, and sync-version.sh now takes the highest release tag and writes the go.mod version too.

  scripts/check-docs-generated.sh regenerates everything into a scratch dir and fails on any difference; make docs-check and the test-docs CI job run it. (user: [email protected], size: 3064) [annotate] [blame] [check-ins using] [more...]

---
title: 'repo conflicts'
weight: 280
generated: true
description: 'List/manage unresolved conflicts'
---

<!-- Generated by scripts/gen-cli-docs.sh from the libfossil --help output. Do not edit; change the help text in cli/ and run make docs-gen. -->

```text
Usage: libfossil repo conflicts <command> [flags]

List/manage unresolved conflicts

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory

Commands:
  repo conflicts ls [flags]
    List all conflicts

  repo conflicts show <file> [flags]
    Show all versions of a conflicted file

  repo conflicts pick <file> [flags]
    Resolve by picking one version

  repo conflicts merge <file> [flags]
    Resolve by re-merging with a different strategy

  repo conflicts extract <file> [flags]
    Extract all versions to disk for manual editing
```

## repo conflicts ls

```text
Usage: libfossil repo conflicts ls [flags]

List all conflicts

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory
```

## repo conflicts show

```text
Usage: libfossil repo conflicts show <file> [flags]

Show all versions of a conflicted file

Arguments:
  <file>    Conflicted file to show

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory
```

## repo conflicts pick

```text
Usage: libfossil repo conflicts pick <file> [flags]

Resolve by picking one version

Arguments:
  <file>    Conflicted file to resolve

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory

      --local          Keep local version
      --remote         Keep remote version
      --base           Revert to base version
  -d, --dir="."        Checkout directory
```

## repo conflicts merge

```text
Usage: libfossil repo conflicts merge <file> [flags]

Resolve by re-merging with a different strategy

Arguments:
  <file>    Conflicted file to re-merge

Flags:
  -h, --help                    Show context-sensitive help.
  -R, --repo=STRING             Path to repository file
  -v, --verbose                 Verbose output

  -d, --dir="."                 Checkout directory

      --strategy="three-way"    Strategy to use
  -d, --dir="."                 Checkout directory
```

## repo conflicts extract

```text
Usage: libfossil repo conflicts extract <file> [flags]

Extract all versions to disk for manual editing

Arguments:
  <file>    Conflicted file to extract

Flags:
  -h, --help           Show context-sensitive help.
  -R, --repo=STRING    Path to repository file
  -v, --verbose        Verbose output

  -d, --dir="."        Checkout directory

  -d, --dir="."        Output directory
```