Skip to content

This PR should solves the merge conflict between dev and master - #1

Merged
heylf merged 4 commits into
solve_merge_conflictfrom
master
Jul 28, 2026
Merged

This PR should solves the merge conflict between dev and master#1
heylf merged 4 commits into
solve_merge_conflictfrom
master

Conversation

@heylf

@heylf heylf commented Jul 28, 2026

Copy link
Copy Markdown
Owner

The titel says it all

heylf and others added 4 commits June 17, 2026 15:13
These files conflicted with the patch and were reset wholesale to the nf-core/tools 4.0.3 template version, on the basis that they carry no pipeline-specific content. If this branch had local edits in them, those edits are gone — please review: .github/workflows/branch.yml .github/workflows/template-version-comment.yml
Remove vulnerable PR-comment artifact pattern
@heylf
heylf merged commit e310c12 into solve_merge_conflict Jul 28, 2026
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