Skip to content

Adding --continue flag to cherry-pick#10532

Merged
macneale4 merged 13 commits intomainfrom
macneale4-claude/verification-resolution
Feb 20, 2026
Merged

Adding --continue flag to cherry-pick#10532
macneale4 merged 13 commits intomainfrom
macneale4-claude/verification-resolution

Conversation

@macneale4
Copy link
Copy Markdown
Contributor

@macneale4 macneale4 commented Feb 19, 2026

Currently our workflow for dealing with conflicts in cherry-pick is to dolt_add then dolt_commit which ends up losing commit data like the author and commit message.

This PR adds the --continue flag to cherry-pick (both stored procedure and CLI), which will preserve the commit metadata.

This flag exists on git cherry-pick

@macneale4 macneale4 marked this pull request as ready for review February 19, 2026 00:44
@coffeegoddd
Copy link
Copy Markdown
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
31981e5 ok 5937471
version total_tests
31981e5 5937471
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
ad5eb54 ok 5937471
version total_tests
ad5eb54 5937471
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
80719e6 ok 5937471
version total_tests
80719e6 5937471
correctness_percentage
100.0

@macneale4 macneale4 force-pushed the macneale4-claude/verification-resolution branch from 80719e6 to 26a3aa4 Compare February 19, 2026 20:48
@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
26a3aa4 ok 5937471
version total_tests
26a3aa4 5937471
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
513b66e ok 5937471
version total_tests
513b66e 5937471
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
836cc49 ok 5937471
version total_tests
836cc49 5937471
correctness_percentage
100.0

@macneale4 macneale4 requested review from fulghum February 20, 2026 00:45
Copy link
Copy Markdown
Contributor

@fulghum fulghum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
2629bcb ok 5937471
version total_tests
2629bcb 5937471
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

test_name from_latency_p95 to_latency_p95 percent_change
tpcc-scale-factor-1 62.19 62.19 0.0
test_name from_server_name from_server_version from_tps to_server_name to_server_version to_tps percent_change
tpcc-scale-factor-1 dolt 72f81a6 37.28 dolt 2629bcb 37.46 0.48

@macneale4 macneale4 merged commit ab4e75c into main Feb 20, 2026
25 checks passed
@macneale4 macneale4 deleted the macneale4-claude/verification-resolution branch February 20, 2026 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants