Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
409 workflow run results
409 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Zone de commandement général - 1 - Mapping CIC Rework Check for merge conflicts #12466: Pull request #3903 synchronize by LC4492
July 22, 2023 15:00 13s
July 22, 2023 15:00 13s
Lesser Drones Check for merge conflicts #12465: Pull request #3939 synchronize by harryob
July 22, 2023 14:24 16s
July 22, 2023 14:24 16s
Ports TGMC autofire Check for merge conflicts #12464: Pull request #3909 synchronize by Zonespace27
July 22, 2023 13:51 11s
July 22, 2023 13:51 11s
fixes welder tool using up fuel on clicks that produce no action (#3959) Check for merge conflicts #12463: Commit 4cded4b pushed by github-merge-queue bot
July 22, 2023 13:02 4m 17s master
master
July 22, 2023 13:02 4m 17s
Experimental: Bump rust_g to 2.1.0 (#3931) Check for merge conflicts #12462: Commit 0a06835 pushed by github-merge-queue bot
July 22, 2023 12:47 4m 15s master
master
July 22, 2023 12:47 4m 15s
Ports TGMC autofire Check for merge conflicts #12461: Pull request #3909 synchronize by Zonespace27
July 22, 2023 11:01 11s
July 22, 2023 11:01 11s
Reworks facehugged effects to make it harder to ignore Check for merge conflicts #12460: Pull request #3843 synchronize by zzzmike
July 22, 2023 10:52 2m 12s
July 22, 2023 10:52 2m 12s
Vendor icon_state fix (#3954) Check for merge conflicts #12459: Commit 5d34ae6 pushed by github-merge-queue bot
July 22, 2023 10:51 2m 11s master
master
July 22, 2023 10:51 2m 11s
Ports TGMC autofire Check for merge conflicts #12458: Pull request #3909 synchronize by Zonespace27
July 22, 2023 10:38 11s
July 22, 2023 10:38 11s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12457: Pull request #3917 ready_for_review by spartanbobby
July 22, 2023 10:15 12s
July 22, 2023 10:15 12s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12456: Pull request #3917 synchronize by spartanbobby
July 22, 2023 10:14 24s
July 22, 2023 10:14 24s
Sweeping LV522 Changes + FORECON GL replaced by FORECON Sniper (Without the sniper) Check for merge conflicts #12455: Pull request #3917 synchronize by spartanbobby
July 22, 2023 10:13 10s
July 22, 2023 10:13 10s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12454: Pull request #3962 synchronize by spartanbobby
July 22, 2023 10:07 10s
July 22, 2023 10:07 10s
laser engraves and rewrites fountain pen flavor + adds detailed lore Check for merge conflicts #12453: Pull request #3796 synchronize by Hopekz
July 22, 2023 08:53 10s
July 22, 2023 08:53 10s
New blood bags (#3961) Check for merge conflicts #12452: Commit 1d28964 pushed by github-merge-queue bot
July 22, 2023 08:40 4m 18s master
master
July 22, 2023 08:40 4m 18s
Fix Xeno Tacmap Persistence (#3957) Check for merge conflicts #12451: Commit 396d2a8 pushed by github-merge-queue bot
July 22, 2023 08:27 4m 18s master
master
July 22, 2023 08:27 4m 18s
New CAS Weapon: BLU-200 Dragons Breath, thermobaric bomb (#3832) Check for merge conflicts #12450: Commit 2ed3c42 pushed by github-merge-queue bot
July 22, 2023 08:14 4m 15s master
master
July 22, 2023 08:14 4m 15s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12449: Pull request #3962 synchronize by spartanbobby
July 22, 2023 07:47 12s
July 22, 2023 07:47 12s
Officer Uniforms Check for merge conflicts #12448: Pull request #3966 synchronize by Misttyy
July 22, 2023 03:19 10s
July 22, 2023 03:19 10s
AI Core APC power storage increase (#3944) Check for merge conflicts #12447: Commit 792cf6e pushed by github-merge-queue bot
July 22, 2023 03:03 4m 17s master
master
July 22, 2023 03:03 4m 17s
Officer Uniforms Check for merge conflicts #12446: Pull request #3966 opened by Misttyy
July 22, 2023 03:02 15s
July 22, 2023 03:02 15s
AI Core APC power storage increase Check for merge conflicts #12445: Pull request #3944 synchronize by Ben10083
July 22, 2023 02:47 11s
July 22, 2023 02:47 11s
AI Core APC power storage increase Check for merge conflicts #12444: Pull request #3944 ready_for_review by Ben10083
July 22, 2023 02:47 2m 13s
July 22, 2023 02:47 2m 13s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12443: Pull request #3962 synchronize by spartanbobby
July 21, 2023 23:10 10s
July 21, 2023 23:10 10s
Drastic Changes to the USS Almayer research department Check for merge conflicts #12442: Pull request #3962 synchronize by spartanbobby
July 21, 2023 23:07 13s
July 21, 2023 23:07 13s