Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,899 workflow run results
7,899 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Research Fire Properties rework/rebalance Check for merge conflicts #19179: Pull request #5519 synchronize by iloveloopers
January 30, 2024 23:26 50s
January 30, 2024 23:26 50s
Research Fire Properties rework/rebalance Check for merge conflicts #19178: Pull request #5519 synchronize by iloveloopers
January 30, 2024 23:25 10s
January 30, 2024 23:25 10s
Réorganisation de l'équipe médicale - 1 (#5458) Check for merge conflicts #19177: Commit ef1f3dd pushed by github-merge-queue bot
January 30, 2024 21:55 4m 15s master
master
January 30, 2024 21:55 4m 15s
Modifies my CODEOWNER files (#5598) Check for merge conflicts #19176: Commit aa18bee pushed by github-merge-queue bot
January 30, 2024 20:59 2m 13s master
master
January 30, 2024 20:59 2m 13s
Modifies my CODEOWNER files Check for merge conflicts #19175: Pull request #5598 synchronize by Zonespace27
January 30, 2024 20:09 1m 44s
January 30, 2024 20:09 1m 44s
Modifies my CODEOWNER files Check for merge conflicts #19174: Pull request #5598 opened by Zonespace27
January 30, 2024 20:09 15s
January 30, 2024 20:09 15s
Project ARES: Admin Console Check for merge conflicts #19173: Pull request #4182 synchronize by realforest2001
January 30, 2024 19:14 10s
January 30, 2024 19:14 10s
Project ARES: Ticket Notifications Check for merge conflicts #19172: Pull request #5510 synchronize by realforest2001
January 30, 2024 19:14 13s
January 30, 2024 19:14 13s
Project ARES: Added Tech Unlock logs Check for merge conflicts #19171: Pull request #5006 synchronize by realforest2001
January 30, 2024 19:14 2m 10s
January 30, 2024 19:14 2m 10s
Project ARES TM Holder (v4) Check for merge conflicts #19170: Pull request #5007 synchronize by realforest2001
January 30, 2024 19:13 2m 12s
January 30, 2024 19:13 2m 12s
Oppressor tailstab nerf Check for merge conflicts #19169: Pull request #5544 ready_for_review by Red-byte3D
January 30, 2024 19:07 22s
January 30, 2024 19:07 22s
Oppressor tailstab nerf Check for merge conflicts #19168: Pull request #5544 synchronize by Red-byte3D
January 30, 2024 19:07 15s
January 30, 2024 19:07 15s
Fix medbay vendor access Check for merge conflicts #19167: Pull request #5597 opened by Drulikar
January 30, 2024 18:44 14s
January 30, 2024 18:44 14s
Food processor can be used to remove carpotoxin and acidic blood with master domestic skill Check for merge conflicts #19166: Pull request #5577 synchronize by LaylaMcC
January 30, 2024 18:03 14s
January 30, 2024 18:03 14s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19165: Pull request #5458 ready_for_review by LC4492
January 30, 2024 17:40 2m 5s
January 30, 2024 17:40 2m 5s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19164: Pull request #5458 synchronize by LC4492
January 30, 2024 17:39 18s
January 30, 2024 17:39 18s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19163: Pull request #5458 synchronize by LC4492
January 30, 2024 17:39 11s
January 30, 2024 17:39 11s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19162: Pull request #5458 synchronize by LC4492
January 30, 2024 17:36 11s
January 30, 2024 17:36 11s
Removes Squad Optics as Default Helmet Visors Check for merge conflicts #19161: Pull request #5583 synchronize by Staykeu
January 30, 2024 15:44 47s
January 30, 2024 15:44 47s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19160: Pull request #5458 synchronize by LC4492
January 30, 2024 15:43 16s
January 30, 2024 15:43 16s
Removes Squad Optics as Default Helmet Visors Check for merge conflicts #19159: Pull request #5583 ready_for_review by Staykeu
January 30, 2024 15:32 13s
January 30, 2024 15:32 13s
Refactor the file watercloset.dm leaving toilet code in it and moving the rest in their own files. Check for merge conflicts #19158: Pull request #5596 opened by Huffie56
January 30, 2024 15:07 13s
January 30, 2024 15:07 13s
Adds alot of new Corporate clothes and jackets, laceup shoes updates and new ties. Check for merge conflicts #19157: Pull request #5437 synchronize by BadAtThisGame302
January 30, 2024 14:45 1m 42s
January 30, 2024 14:45 1m 42s
Fix greenfire not mixing well with lighting Check for merge conflicts #19156: Pull request #5595 opened by Drulikar
January 30, 2024 14:41 1m 1s
January 30, 2024 14:41 1m 1s
Adds alot of new Corporate clothes and jackets, laceup shoes updates and new ties. Check for merge conflicts #19155: Pull request #5437 synchronize by BadAtThisGame302
January 30, 2024 14:39 14s
January 30, 2024 14:39 14s