Skip to content

[bot] Merge 26.3 to 26.7 (Conflicts) - #8230

Merged
github-actions[bot] merged 2 commits into
release26.7-SNAPSHOTfrom
26.7_fb_bot_merge_26.3
Oct 26, 2026
Merged

github-actions[bot] merged 2 commits into
release26.7-SNAPSHOTfrom
26.7_fb_bot_merge_26.3

Conversation

@github-actions

Copy link
Copy Markdown

Automatic merge failed! Please merge 26.3 into 26.7_fb_bot_merge_26.3 and resolve conflicts manually.

git fetch
git checkout 26.7_fb_bot_merge_26.3
git reset --hard origin/release26.7-SNAPSHOT
git merge 2ce8ba51cb9c61cb3644ac7f917d7a0ebef78022 -m "Merge 26.3 to 26.7"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=26.7_fb_bot_merge_26.3

…#7993)

- Two explicit week numbering functions
- isnumeric() returns 1/0 on both databases
- A pivot value is emitted as a dialect-quoted literal
- A pivot no longer stores a null column
@cnathe
cnathe force-pushed the 26.7_fb_bot_merge_26.3 branch from b6e73ab to faed8a1 Compare October 26, 2026 11:25
@github-actions
github-actions Bot merged commit faed8a1 into release26.7-SNAPSHOT Oct 26, 2026
9 of 10 checks passed
@github-actions
github-actions Bot deleted the 26.7_fb_bot_merge_26.3 branch October 26, 2026 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants