Moonyandike709 ab1b37ebbf Add a merge conflict check. (#8626) ...

* Add a merge conflict check.

This is directly copied from https://github.com/wixoaGit/OpenDream/pull/648

* Update .github/workflows/conflict-labeler.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

Co-authored-by: ike709 <ike709@users.noreply.github.com>

2022-06-04 20:34:48 -07:00

..

build-docfx.yml

Update build-docfx.yml

2022-03-23 17:31:21 -06:00

build-test-debug.yml

More github action tests (#7301)

2022-05-30 19:52:27 -07:00

build-test-release.yml

More github action tests (#7301)

2022-05-30 19:52:27 -07:00

conflict-labeler.yml

Add a merge conflict check. (#8626)

2022-06-04 20:34:48 -07:00

labeler-needsreview.yml

Auto-labeling actions for pull requests (#6117)

2022-01-10 16:06:08 -07:00

labeler-pr.yml

Auto-labeling actions for pull requests (#6117)

2022-01-10 16:06:08 -07:00

no-submodule-update.yml

workflow (#7987)

2022-05-07 13:17:55 +02:00

publish.yml

Allow publish workflow to be manually dispatched.

2022-04-03 13:29:45 +02:00

rsi-diff.yml

update RSI diff workflow to space-wizards fork

2022-01-08 15:34:20 -07:00

test-packaging.yml

Fix debug tests with engine change (#8609)

2022-06-03 02:53:57 -07:00

update-wiki.yml

Update update-wiki.yml

2022-03-22 17:28:22 -06:00

validate-rsis.yml

Only run workflows when necessary (#4790)

2021-10-07 13:32:42 -07:00

yaml-linter.yml

Update to .NET 6 and C# 10 (#5233)

2021-11-09 15:05:07 +01:00