mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-20 02:24:58 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

Allow staging tables with merge conflicts.

Browse Source
This commit is contained in:
Nick Tobey
2023-06-01 19:24:04 -07:00
parent 5260397aed
commit bef50ffebd
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
go/cmd/dolt/commands/add.go
View File

@@ -110,6 +110,13 @@ func (cmd AddCmd) Exec(ctx context.Context, commandStr string, args []string, dE
defer closeFunc()
}
// Allow staging tables with merge conflicts.
_, _, err = queryist.Query(sqlCtx, "set @@dolt_force_transaction_commit=1;")
if err != nil {
cli.PrintErrln(errhand.VerboseErrorFromError(err))
return 1
}
ap := cli.CreateAddArgParser()
helpPr, _ := cli.HelpAndUsagePrinters(cli.CommandDocsForCommandString(commandStr, addDocs, ap))
apr := cli.ParseArgsOrDie(ap, args, helpPr)