Skip to content

fix(merge): changelog conflicts#1049

Merged
aeppling merged 7 commits intodevelopfrom
fix/resolve-merge-conflict
Apr 6, 2026
Merged

fix(merge): changelog conflicts#1049
aeppling merged 7 commits intodevelopfrom
fix/resolve-merge-conflict

Conversation

@aeppling
Copy link
Copy Markdown
Contributor

@aeppling aeppling commented Apr 6, 2026

No description provided.

aeppling and others added 7 commits March 30, 2026 15:13
fix(refacto-codebase): technical docs & sub folders
…-components--rtk

chore(master): release 0.34.2
fix(refacto): wrappers for standardization, exit codes lexer tokenizer, constants, code clean
…-components--rtk

chore(master): release 0.34.3
Keep develop's [Unreleased] section on top, followed by master's
released versions (0.34.3, 0.34.2).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
1 out of 2 committers have signed the CLA.

✅ aeppling
❌ github-actions[bot]
You have signed the CLA already but the status is still pending? Let us recheck it.

@aeppling aeppling merged commit d92c5d2 into develop Apr 6, 2026
5 of 6 checks passed
@pszymkowiak pszymkowiak added the effort-small Quelques heures, 1 fichier label Apr 6, 2026
@pszymkowiak
Copy link
Copy Markdown
Collaborator

[w] wshm · Automated triage by AI

📊 Automated PR Analysis

🔧 Type chore
🟢 Risk low

Summary

Resolves merge conflicts in the changelog and version files by updating the version from 0.34.1 to 0.34.3. Adds missing changelog entries for versions 0.34.2 and 0.34.3 and bumps the version in Cargo.toml, Cargo.lock, and the release-please manifest.

Review Checklist

  • Tests present
  • Breaking change
  • Docs updated

Analyzed automatically by wshm · This is an automated analysis, not a human review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

effort-small Quelques heures, 1 fichier

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants