Skip to content

chore: sync dev with main (conflicts)#59

Merged
c-vigo merged 3 commits intodevfrom
chore/sync-main-to-dev-13-1
Mar 22, 2026
Merged

chore: sync dev with main (conflicts)#59
c-vigo merged 3 commits intodevfrom
chore/sync-main-to-dev-13-1

Conversation

@vig-os-release-app
Copy link
Contributor

Automated sync of main to dev found merge conflicts that require manual resolution.

How to resolve

git fetch origin chore/sync-main-to-dev-13-1:chore/sync-main-to-dev-13-1
git checkout chore/sync-main-to-dev-13-1
git merge origin/dev
# resolve conflicts
git commit -S
git push origin chore/sync-main-to-dev-13-1

Once pushed, this PR will update and become mergeable.

commit-action-bot bot and others added 3 commits March 22, 2026 09:43
Strip empty Unreleased section from release branch.
Release date TBD (set during finalization).
## Release 0.3.1

This PR prepares release 0.3.1 for merge to main.

### Release Content

## [0.3.1] - TBD

### Changed

- Deploy devcontainer 0.3.1-rc10
@c-vigo c-vigo merged commit 680c24f into dev Mar 22, 2026
10 checks passed
@c-vigo c-vigo deleted the chore/sync-main-to-dev-13-1 branch March 22, 2026 12:27
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.

1 participant