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

OSOE-144: Automatic comment on pull requests that have a merge conflict #60

Merged
merged 43 commits into from
Oct 17, 2022

Conversation

Luko6
Copy link
Contributor

@Luko6 Luko6 commented Oct 4, 2022

OSOE-144

Fixes #35

.github/workflows/verify-this-repo.yml Outdated Show resolved Hide resolved
.github/actions/check-merge-conflict/action.yml Outdated Show resolved Hide resolved
.github/actions/check-merge-conflict/action.yml Outdated Show resolved Hide resolved
.github/actions/check-merge-conflict/action.yml Outdated Show resolved Hide resolved
.github/workflows/check-merge-conflict.yml Outdated Show resolved Hide resolved
Docs/Actions.md Outdated Show resolved Hide resolved
.github/workflows/verify-this-repo.yml Outdated Show resolved Hide resolved
Docs/Workflows.md Outdated Show resolved Hide resolved
@Piedone Piedone merged commit 25d3a28 into dev Oct 17, 2022
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.

Automatic comment on pull requests that have a merge conflict (OSOE-144)
2 participants