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

Add merge_conflict_job #3

Merged

koppor merged 1 commit into main from add-conflict-marker-find-check

Nov 29, 2023

Collaborator

koppor commented Nov 29, 2023

Adds https://github.com/olivernybroe/action-conflict-finder


          Add merge_conflict_job

56d7635

Collaborator Author

koppor commented Nov 29, 2023

I cannot solve the merge conflicts, but I'll let the action do its work, maybe, it helps someone

koppor added this pull request to the merge queue

Merged via the queue into main with commit 0904c13

1 of 2 checks passed

koppor deleted the add-conflict-marker-find-check branch

November 29, 2023 19:31

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet