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.

Sign up for GitHub

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

Jump to bottom

Automatically Check for Merge Conflicts #80

Merged
merged 1 commit into from Sep 24, 2022
Merged

Automatically Check for Merge Conflicts #80

merged 1 commit into from Sep 24, 2022

Conversation

lkiesow
Copy link
Contributor

@lkiesow lkiesow commented Sep 24, 2022

This patch adds a GitHub Actions workflow to automatically check for merge conflicts and mark pull requests as having conflicts.

@lkiesow
Automatically Check for Merge Conflicts
347e3a2 
This patch adds a GitHub Actions workflow to automatically check for
merge conflicts and mark pull requests as having conflicts.
@lkiesow lkiesow added the tests Modifications to the project's (unit) tests label Sep 24, 2022
@lkiesow lkiesow merged commit 5a36314 into emissions-api:main Sep 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
tests Modifications to the project's (unit) tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@lkiesow