Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
9,917 workflow run results
9,917 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Research xenomorph "dissections" Check for merge conflicts #22553: Pull request #6188 synchronize by kiVts
May 15, 2024 23:49 12s
May 15, 2024 23:49 12s
accessory removal menu is now radial Check for merge conflicts #22552: Pull request #6274 synchronize by AndroBetel
May 15, 2024 18:21 46s
May 15, 2024 18:21 46s
accessory removal menu is now radial Check for merge conflicts #22551: Pull request #6274 ready_for_review by AndroBetel
May 15, 2024 18:21 37s
May 15, 2024 18:21 37s
accessory removal menu is now radial Check for merge conflicts #22550: Pull request #6274 synchronize by AndroBetel
May 15, 2024 18:20 12s
May 15, 2024 18:20 12s
Fixes light attachments setting and add pref for ammo counter Check for merge conflicts #22549: Pull request #6251 ready_for_review by vero5123
May 15, 2024 14:21 25s
May 15, 2024 14:21 25s
Fixes light attachments setting and add pref for ammo counter Check for merge conflicts #22548: Pull request #6251 synchronize by vero5123
May 15, 2024 14:20 13s
May 15, 2024 14:20 13s
Fixes light attachments setting and add pref for ammo counter Check for merge conflicts #22547: Pull request #6251 synchronize by vero5123
May 15, 2024 14:17 15s
May 15, 2024 14:17 15s
TGUI Parity with Upstream and Remaining React Porting & Polish Check for merge conflicts #22546: Pull request #6244 synchronize by Drulikar
May 15, 2024 13:32 13s
May 15, 2024 13:32 13s
Milkshakes no longer attempt to drive your body temperature to absolu… Check for merge conflicts #22545: Commit 06095cf pushed by github-merge-queue bot
May 15, 2024 13:30 4m 13s master
master
May 15, 2024 13:30 4m 13s
Med Vendor Rebalance (#6103) Check for merge conflicts #22544: Commit 71f0806 pushed by github-merge-queue bot
May 15, 2024 13:23 4m 16s master
master
May 15, 2024 13:23 4m 16s
Fix verb to adjust predator slots Check for merge conflicts #22543: Pull request #6289 opened by Drulikar
May 15, 2024 10:56 11s
May 15, 2024 10:56 11s
Fixes issuing a null order (#6286) Check for merge conflicts #22542: Commit 958bf9f pushed by github-merge-queue bot
May 15, 2024 09:04 4m 13s master
master
May 15, 2024 09:04 4m 13s
Fix MRE automatic trashing and nade box trashing (#6285) Check for merge conflicts #22541: Commit 24c73cb pushed by github-merge-queue bot
May 15, 2024 08:57 4m 14s master
master
May 15, 2024 08:57 4m 14s
Heavy Sniper Part 2 - The Heavying Check for merge conflicts #22540: Pull request #6163 synchronize by Kaga-404
May 15, 2024 08:21 13s
May 15, 2024 08:21 13s
Fixes humans unable to use vehicle gunner seat (#6247) Check for merge conflicts #22539: Commit 6fdd3cd pushed by github-merge-queue bot
May 15, 2024 06:45 4m 14s master
master
May 15, 2024 06:45 4m 14s
Fixes humans unable to use vehicle gunner seat Check for merge conflicts #22538: Pull request #6247 ready_for_review by Doubleumc
May 15, 2024 05:33 9s
May 15, 2024 05:33 9s
Fixes humans unable to use vehicle gunner seat Check for merge conflicts #22537: Pull request #6247 synchronize by Doubleumc
May 15, 2024 05:29 9s
May 15, 2024 05:29 9s
Fixes humans unable to use vehicle gunner seat Check for merge conflicts #22536: Pull request #6247 synchronize by Doubleumc
May 15, 2024 05:21 12s
May 15, 2024 05:21 12s
OT CAS rocket Check for merge conflicts #22535: Pull request #5957 synchronize by iloveloopers
May 15, 2024 04:31 9s
May 15, 2024 04:31 9s
OT CAS rocket Check for merge conflicts #22534: Pull request #5957 synchronize by iloveloopers
May 15, 2024 04:30 11s
May 15, 2024 04:30 11s
runner/crusher drag speed nerf Check for merge conflicts #22533: Pull request #6288 synchronize by 567Turtle
May 15, 2024 04:14 9s
May 15, 2024 04:14 9s
runner/crusher drag speed nerf Check for merge conflicts #22532: Pull request #6288 opened by 567Turtle
May 15, 2024 04:10 10s
May 15, 2024 04:10 10s
VP78 Range + ROF Buff (#6267) Check for merge conflicts #22531: Commit 41a1597 pushed by github-merge-queue bot
May 15, 2024 03:54 4m 15s master
master
May 15, 2024 03:54 4m 15s
Med Vendor Rebalance Check for merge conflicts #22530: Pull request #6103 synchronize by Drulikar
May 15, 2024 03:35 12s
May 15, 2024 03:35 12s
OT CAS rocket Check for merge conflicts #22529: Pull request #5957 synchronize by iloveloopers
May 15, 2024 03:23 11s
May 15, 2024 03:23 11s