Preserve uncommitted tables during checkout, reset --hard, and rebase#11033
Draft
elianddb wants to merge 23 commits into
Draft
Preserve uncommitted tables during checkout, reset --hard, and rebase#11033elianddb wants to merge 23 commits into
checkout, reset --hard, and rebase#11033elianddb wants to merge 23 commits into
Conversation
Contributor
|
@coffeegoddd DOLT
|
Contributor
Contributor
|
@coffeegoddd DOLT
|
Contributor
|
@coffeegoddd DOLT
|
Contributor
Contributor
|
@coffeegoddd DOLT
|
Contributor
Contributor
|
@coffeegoddd DOLT
|
Contributor
Contributor
Contributor
|
@coffeegoddd DOLT
|
66e2fec to
86d5c04
Compare
Contributor
|
@coffeegoddd DOLT
|
Contributor
Contributor
…hard retagging only updates the schema; row data remains keyed by the old tag, so non-empty untracked tables with a collision will have inaccessible rows.
checkout, reset --hard, and rebase
Contributor
Contributor
|
@coffeegoddd DOLT
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Uncommitted tables on a branch could be silently lost when you switched branches or ran
dolt reset --hard. This carries them across instead and aligns the safety checks with git.dolt checkout,dolt checkout --move,dolt reset --hard, anddolt rebasedolt checkout -fdiscard local tracked changes but keep untracked tablesdolt_ignore-matched tables on the source branch during the carryFix
reset --hardsilently drops untracked tables with column tag collisions #11007