Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
850 workflow run results
850 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Overwatch Console TGUI Refactor Check for merge conflicts #13514: Pull request #4178 opened by TheGamerdk
August 13, 2023 12:10 15s
August 13, 2023 12:10 15s
fixes out of bound areas in play are of LV522 (#4168) Check for merge conflicts #13513: Commit cb02c52 pushed by github-merge-queue bot
August 13, 2023 08:36 4m 15s master
master
August 13, 2023 08:36 4m 15s
Remove ckey from queen jellies Check for merge conflicts #13512: Pull request #4177 opened by Drulikar
August 13, 2023 05:20 12s
August 13, 2023 05:20 12s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13511: Pull request #4003 synchronize by Zonespace27
August 13, 2023 02:15 12s
August 13, 2023 02:15 12s
Possible fix for binoc perma zoom Check for merge conflicts #13510: Pull request #4176 opened by morrowwolf
August 13, 2023 02:12 11s
August 13, 2023 02:12 11s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13509: Pull request #4003 synchronize by Zonespace27
August 13, 2023 01:57 11s
August 13, 2023 01:57 11s
Brings automatic weaponry to the marine and surv arsenal Check for merge conflicts #13508: Pull request #4003 synchronize by Zonespace27
August 13, 2023 01:54 2m 16s
August 13, 2023 01:54 2m 16s
Helmet Visors/Optics and built-in HUDs Check for merge conflicts #13507: Pull request #4156 synchronize by morrowwolf
August 13, 2023 00:13 15s
August 13, 2023 00:13 15s
Alters ASay chat color back to the old MSay color (#4151) Check for merge conflicts #13506: Commit 5d2305b pushed by github-merge-queue bot
August 12, 2023 23:32 4m 17s master
master
August 12, 2023 23:32 4m 17s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13505: Pull request #4175 synchronize by Ben10083
August 12, 2023 23:19 3m 11s
August 12, 2023 23:19 3m 11s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13504: Pull request #4175 ready_for_review by Ben10083
August 12, 2023 23:19 3m 4s
August 12, 2023 23:19 3m 4s
Admin Proc for Distress Signal TGUI and Fix Check for merge conflicts #13503: Pull request #4175 opened by Ben10083
August 12, 2023 23:19 2m 41s
August 12, 2023 23:19 2m 41s
More Xeno Alliances Tweaks (#4053) Check for merge conflicts #13502: Commit 87f2e5a pushed by github-merge-queue bot
August 12, 2023 23:16 4m 14s master
master
August 12, 2023 23:16 4m 14s
autowiki port and gun autowiki (#4107) Check for merge conflicts #13501: Commit e85d66a pushed by github-merge-queue bot
August 12, 2023 23:02 4m 17s master
master
August 12, 2023 23:02 4m 17s
Yautja Vision Changes (#4046) Check for merge conflicts #13500: Commit ae962a9 pushed by github-merge-queue bot
August 12, 2023 22:48 4m 19s master
master
August 12, 2023 22:48 4m 19s
Stops new specs using all gear (#4162) Check for merge conflicts #13499: Commit f5cbf75 pushed by github-merge-queue bot
August 12, 2023 22:34 4m 15s master
master
August 12, 2023 22:34 4m 15s
Yautja Vision Changes Check for merge conflicts #13498: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:11 3m 27s
August 12, 2023 22:11 3m 27s
Yautja Change Holder Check for merge conflicts #13497: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:11 2m 37s
August 12, 2023 22:11 2m 37s
Yautja Change Holder Check for merge conflicts #13496: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:07 5m 49s
August 12, 2023 22:07 5m 49s
Yautja Vision Changes Check for merge conflicts #13495: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:07 6m 1s
August 12, 2023 22:07 6m 1s
Yautja Change Holder Check for merge conflicts #13494: Pull request #4063 synchronize by realforest2001
August 12, 2023 22:05 14s
August 12, 2023 22:05 14s
Yautja Vision Changes Check for merge conflicts #13493: Pull request #4046 synchronize by realforest2001
August 12, 2023 22:05 13s
August 12, 2023 22:05 13s
Alters ASay chat color back to the old MSay color Check for merge conflicts #13492: Pull request #4151 synchronize by harryob
August 12, 2023 21:41 14s
August 12, 2023 21:41 14s
Smurfing Queens (#4166) Check for merge conflicts #13491: Commit 1eebb2c pushed by github-merge-queue bot
August 12, 2023 21:33 4m 14s master
master
August 12, 2023 21:33 4m 14s
Fix you will no longer be able to feed without any limit with the fork. Check for merge conflicts #13490: Pull request #4174 ready_for_review by Huffie56
August 12, 2023 20:38 12s
August 12, 2023 20:38 12s