Skip to content

Commit d4e1d3d

Browse files
committed
dolt-conflicts-{cat,resolve}: add pages
Split dolt-conflicts into two separate pages for the actual subcommands: - dolt-conflicts-cat: Display conflicts for a table - dolt-conflicts-resolve: Resolve conflicts with --ours, --theirs, or --both Fixes reviewer feedback: - dolt conflicts is not a standalone command - Fixed link anchors to point to correct documentation sections Closes #5471
1 parent e4919b5 commit d4e1d3d

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

pages/common/dolt-conflicts-cat.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# dolt conflicts cat
2+
3+
> Display merge conflicts for a specific table in Dolt databases.
4+
> More information: <https://docs.dolthub.com/cli-reference/cli#dolt-conflicts-cat>.
5+
6+
- Show conflicts for a specific table:
7+
8+
`dolt conflicts cat {{table_name}}`
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# dolt conflicts resolve
2+
3+
> Resolve merge conflicts in Dolt databases.
4+
> More information: <https://docs.dolthub.com/cli-reference/cli#dolt-conflicts-resolve>.
5+
6+
- Resolve conflicts by taking the current version (ours):
7+
8+
`dolt conflicts resolve --ours {{table_name}}`
9+
10+
- Resolve conflicts by taking the incoming version (theirs):
11+
12+
`dolt conflicts resolve --theirs {{table_name}}`
13+
14+
- Resolve conflicts by taking both versions:
15+
16+
`dolt conflicts resolve --both {{table_name}}`

0 commit comments

Comments
 (0)