title: 'repo conflicts' weight: 280 generated: true
description: 'List/manage unresolved conflicts'
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
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
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
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
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
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