resolve hidden merge conflict with duplicate db name in json configs#18292
Merged
Mytherin merged 2 commits intoduckdb:v1.3-ossivalisfrom Jul 17, 2025
Merged
resolve hidden merge conflict with duplicate db name in json configs#18292Mytherin merged 2 commits intoduckdb:v1.3-ossivalisfrom
Mytherin merged 2 commits intoduckdb:v1.3-ossivalisfrom
Conversation
carlopi
approved these changes
Jul 17, 2025
Collaborator
|
Thanks! |
github-actions bot
pushed a commit
to duckdb/duckdb-r
that referenced
this pull request
Jul 18, 2025
[Fix] Missing block when renaming fields (duckdb/duckdb#18293) Bump vcpkg-duckdb-ports, now fixing also mingw (duckdb/duckdb#18300) resolve hidden merge conflict with duplicate db name in json configs (duckdb/duckdb#18292) [Unittester] Add autoloading option (duckdb/duckdb#18290) Fixup Main.yml for v1.3-ossivalis post duckdb/duckdb#18282 (duckdb/duckdb#18289)
github-actions bot
added a commit
to duckdb/duckdb-r
that referenced
this pull request
Jul 18, 2025
[Fix] Missing block when renaming fields (duckdb/duckdb#18293) Bump vcpkg-duckdb-ports, now fixing also mingw (duckdb/duckdb#18300) resolve hidden merge conflict with duplicate db name in json configs (duckdb/duckdb#18292) [Unittester] Add autoloading option (duckdb/duckdb#18290) Fixup Main.yml for v1.3-ossivalis post duckdb/duckdb#18282 (duckdb/duckdb#18289) Co-authored-by: krlmlr <krlmlr@users.noreply.github.com>
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
4 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.
No description provided.