Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix comment section headers so they don't give phantom merge conflict warnings #3201

Merged
merged 4 commits into from
Oct 9, 2024

Conversation

jfy133
Copy link
Member

@jfy133 jfy133 commented Oct 8, 2024

Because ==== is used in git conflict merges

Copy link
Contributor

@mashehu mashehu left a comment

Choose a reason for hiding this comment

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

can't change it in the nf-core modules... needs to go through the modules repo

@jfy133
Copy link
Member Author

jfy133 commented Oct 8, 2024

Gah!

@jfy133 jfy133 closed this Oct 8, 2024
@jfy133
Copy link
Member Author

jfy133 commented Oct 8, 2024

nf-core/modules#6755

@mirpedrol
Copy link
Member

But the local subworkflow has to be changed here 😄

@jfy133
Copy link
Member Author

jfy133 commented Oct 8, 2024

Gah!

@mirpedrol
Copy link
Member

I will reopen this PR to fix the local subworkflow and update the others which you fixed in modules

@mirpedrol mirpedrol reopened this Oct 9, 2024
Copy link

codecov bot commented Oct 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 75.39%. Comparing base (61dec48) to head (0840f24).
Report is 8 commits behind head on dev.

Additional details and impacted files

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

@jfy133
Copy link
Member Author

jfy133 commented Oct 9, 2024

I'll fix this now @mirpedrol !

@jfy133 jfy133 requested a review from mashehu October 9, 2024 08:21
@jfy133 jfy133 merged commit d45b7d1 into dev Oct 9, 2024
84 checks passed
@jfy133 jfy133 deleted the fix-large-comment-header-formatting branch October 9, 2024 08:42
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