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

Prevent Git conflict markers from getting published #54

Merged
merged 1 commit into from
May 14, 2024

Conversation

jason-seqera
Copy link
Contributor

This would be cool if it works; supposed to prevent merges if >>>>> conflict markers are present, meaning someone accidentally committed a merge conflict block.

@jason-seqera jason-seqera self-assigned this May 13, 2024
Copy link

netlify bot commented May 13, 2024

Deploy Preview for seqera-docs ready!

Name Link
🔨 Latest commit 5438053
🔍 Latest deploy log https://app.netlify.com/sites/seqera-docs/deploys/66429d97a7c9290008cd3db8
😎 Deploy Preview https://deploy-preview-54--seqera-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@justinegeffen justinegeffen self-requested a review May 14, 2024 16:49
@jason-seqera jason-seqera merged commit 168e7d1 into master May 14, 2024
5 checks passed
@jason-seqera jason-seqera deleted the fail-build-on-merge-conflict-markers branch May 14, 2024 17:08
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.

2 participants