Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
11,253 workflow run results
11,253 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Hostile Survivor Rework Check for merge conflicts #23869: Pull request #6308 synchronize by Steelpoint
June 21, 2024 15:09 12s
June 21, 2024 15:09 12s
Vampire tail jab changes (try 2) Check for merge conflicts #23868: Pull request #6376 ready_for_review by Red-byte3D
June 21, 2024 14:47 10s
June 21, 2024 14:47 10s
Vampire tail jab changes (try 2) Check for merge conflicts #23867: Pull request #6376 synchronize by Red-byte3D
June 21, 2024 14:21 12s
June 21, 2024 14:21 12s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23866: Pull request #6248 synchronize by Zenith00000
June 21, 2024 13:33 10s
June 21, 2024 13:33 10s
Hostile Survivor Rework Check for merge conflicts #23865: Pull request #6308 synchronize by Steelpoint
June 21, 2024 11:52 13s
June 21, 2024 11:52 13s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23864: Pull request #6248 synchronize by Zenith00000
June 21, 2024 06:43 11s
June 21, 2024 06:43 11s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #23863: Pull request #6248 synchronize by Zenith00000
June 21, 2024 05:42 10s
June 21, 2024 05:42 10s
Simple animals don't block projectiles after death anymore Check for merge conflicts #23862: Pull request #6522 synchronize by ihatethisengine
June 21, 2024 04:04 10s
June 21, 2024 04:04 10s
Simple animals don't block projectiles after death anymore Check for merge conflicts #23861: Pull request #6522 opened by ihatethisengine
June 21, 2024 04:02 14s
June 21, 2024 04:02 14s
custom research chemicals with an intensityfire above or equal to 50 will now burn white Check for merge conflicts #23860: Pull request #6521 opened by iloveloopers
June 21, 2024 01:45 2m 11s
June 21, 2024 01:45 2m 11s
removes macho sauce and water recipe Check for merge conflicts #23859: Pull request #6513 synchronize by iloveloopers
June 21, 2024 00:59 11s
June 21, 2024 00:59 11s
Alter Xeno Evolution: Larva -> Drone Mandatory Check for merge conflicts #23858: Pull request #6298 ready_for_review by Venuska1117
June 20, 2024 23:03 11s
June 20, 2024 23:03 11s
Alter Xeno Evolution: Larva -> Drone Mandatory Check for merge conflicts #23857: Pull request #6298 synchronize by Venuska1117
June 20, 2024 23:03 12s
June 20, 2024 23:03 12s
Allow Surgery, construction small puddles. Check for merge conflicts #23856: Pull request #6340 ready_for_review by hislittlecuzingames
June 20, 2024 16:17 10s
June 20, 2024 16:17 10s
Allow Surgery, construction small puddles. Check for merge conflicts #23855: Pull request #6340 synchronize by hislittlecuzingames
June 20, 2024 16:12 11s
June 20, 2024 16:12 11s
Added Vendables to Staff Officer Closet Check for merge conflicts #23854: Pull request #6496 ready_for_review by hislittlecuzingames
June 20, 2024 15:56 13s
June 20, 2024 15:56 13s
Added Vendables to Staff Officer Closet Check for merge conflicts #23853: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:46 14s
June 20, 2024 15:46 14s
Added Vendables to Staff Officer Closet Check for merge conflicts #23852: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:35 13s
June 20, 2024 15:35 13s
Added Vendables to Staff Officer Closet Check for merge conflicts #23851: Pull request #6496 synchronize by hislittlecuzingames
June 20, 2024 15:29 14s
June 20, 2024 15:29 14s
Fix humans seeing lesser drone information when examining the core (#… Check for merge conflicts #23850: Commit 09324a0 pushed by github-merge-queue bot
June 20, 2024 12:49 4m 18s master
master
June 20, 2024 12:49 4m 18s
Update CONTRIBUTING.md (#6519) Check for merge conflicts #23849: Commit 3fd9a4f pushed by github-merge-queue bot
June 20, 2024 12:43 2m 14s master
master
June 20, 2024 12:43 2m 14s
Update CONTRIBUTING.md Check for merge conflicts #23848: Pull request #6519 synchronize by Drulikar
June 20, 2024 12:24 13s
June 20, 2024 12:24 13s
Update CONTRIBUTING.md Check for merge conflicts #23847: Pull request #6519 opened by Drulikar
June 20, 2024 12:21 11s
June 20, 2024 12:21 11s
Larva aesthetic update Check for merge conflicts #23846: Pull request #6439 synchronize by Blundir
June 20, 2024 10:37 12s
June 20, 2024 10:37 12s
Remove self-extinguishing with acid spray (#6508) Check for merge conflicts #23845: Commit 048a671 pushed by github-merge-queue bot
June 20, 2024 09:02 4m 18s master
master
June 20, 2024 09:02 4m 18s