Skip to content

chore(gitflow): upmerge main -> develop#23

Merged
mPokornyETM merged 12 commits intodevelopfrom
feature/upmerge-main-to-develop
Jan 16, 2026
Merged

chore(gitflow): upmerge main -> develop#23
mPokornyETM merged 12 commits intodevelopfrom
feature/upmerge-main-to-develop

Conversation

@github-actions
Copy link
Contributor

Automated upmerge PR.

Source: main
Target: develop
Branch: feature/upmerge-main-to-develop

If there are merge conflicts:

  1. Checkout feature/upmerge-main-to-develop locally
  2. Run git fetch origin then git merge origin/develop
  3. Resolve conflicts, commit, and push

mPokornyETM
mPokornyETM previously approved these changes Jan 16, 2026
Copy link
Contributor

@mPokornyETM mPokornyETM left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@mPokornyETM mPokornyETM left a comment

Choose a reason for hiding this comment

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

LGTM

@mPokornyETM mPokornyETM merged commit 68f21e0 into develop Jan 16, 2026
18 checks passed
@mPokornyETM mPokornyETM deleted the feature/upmerge-main-to-develop branch January 16, 2026 20:07
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.

1 participant