dolt-conflicts: add page #19544
Closed
dolt-conflicts: add page #19544
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
new command
dmmqz
reviewed
Nov 23, 2025
Member
dmmqz
left a comment
dmmqz
left a comment
There was a problem hiding this comment.
dolt conflicts doesn't seem to be a command by itself:
$ dolt conflicts
Valid commands for dolt conflicts are
cat - Writes out the table conflicts.
resolve - Removes rows from list of conflicts
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 tldr-pages#5471
youssef-horo
force-pushed
the
dolt-conflicts-documentation
branch
from
475f6e0 to
d4e1d3d
Compare
Author
|
Hi @dmmqz, thanks for the review! I've addressed your feedback:
Both links have been verified and work correctly. The old Ready for another review! |
Member
|
Just use a single dolt conflicts page that documents both. |
Member
|
@youssef-horo Please address my comment |
Member
|
Shame commit history wasn't preserved. Otherwise I would have just reverted the change and pushed the original page. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
The page(s) are in the correct platform directories:
common,linux,osx,windows,sunos,android, etc.The page description(s) have links to documentation or a homepage.
The page(s) follow the content guidelines.
The page(s) follow the style guide.
The PR contains at most 5 new pages.
The PR is authored by me, or has been human-reviewed if it was created with AI or machine translation software.
The PR title conforms to the recommended templates.
Version of the command being documented (if known): Latest version (as per dolt documentation)
Reference issue: #5471