Commit d4e1d3d
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 #54711 parent e4919b5 commit d4e1d3d
File tree
2 files changed
+24
-0
lines changed- pages/common
2 files changed
+24
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
0 commit comments