Skip to content

automatically handle merge conflicts for changelog files with union#4223

Merged
mashehu merged 2 commits intonf-core:devfrom
mashehu:automatically-handle-changelog-merge-conflicts
Apr 27, 2026
Merged

automatically handle merge conflicts for changelog files with union#4223
mashehu merged 2 commits intonf-core:devfrom
mashehu:automatically-handle-changelog-merge-conflicts

Conversation

@mashehu
Copy link
Copy Markdown
Contributor

@mashehu mashehu commented Apr 27, 2026

No description provided.

@mashehu mashehu force-pushed the automatically-handle-changelog-merge-conflicts branch from 80c01f8 to 71a9686 Compare April 27, 2026 08:57
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 27, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.32%. Comparing base (fbc88e5) to head (93ba49a).

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@mashehu mashehu force-pushed the automatically-handle-changelog-merge-conflicts branch from 71a9686 to 08f0666 Compare April 27, 2026 09:04
@mashehu
Copy link
Copy Markdown
Contributor Author

mashehu commented Apr 27, 2026

@nf-core-bot changelog

@mashehu mashehu enabled auto-merge (squash) April 27, 2026 09:21
@mashehu mashehu force-pushed the automatically-handle-changelog-merge-conflicts branch from 3bf15da to 93ba49a Compare April 27, 2026 09:21
Copy link
Copy Markdown
Member

@JoseEspinosa JoseEspinosa left a comment

Choose a reason for hiding this comment

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

LGTM

@mashehu mashehu merged commit 54ed4b1 into nf-core:dev Apr 27, 2026
118 checks passed
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