Skip to content

dolt-conflicts: add page #19544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

dolt-conflicts: add page #19544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pages/common/dolt-conflicts-cat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# dolt conflicts cat

> Display merge conflicts for a specific table in Dolt databases.
> More information: <https://docs.dolthub.com/cli-reference/cli#dolt-conflicts-cat>.
- Show conflicts for a specific table:

`dolt conflicts cat {{table_name}}`
16 changes: 16 additions & 0 deletions pages/common/dolt-conflicts-resolve.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# dolt conflicts resolve

> Resolve merge conflicts in Dolt databases.
> More information: <https://docs.dolthub.com/cli-reference/cli#dolt-conflicts-resolve>.

- Resolve conflicts by taking the current version (ours):

`dolt conflicts resolve --ours {{table_name}}`

- Resolve conflicts by taking the incoming version (theirs):

`dolt conflicts resolve --theirs {{table_name}}`

- Resolve conflicts by taking both versions:

`dolt conflicts resolve --both {{table_name}}`