Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,977 workflow run results
2,977 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Royal Marines Commando Check for merge conflicts #14146: Pull request #4098 synchronize by spartanbobby
September 3, 2023 14:49 16s
September 3, 2023 14:49 16s
Royal Marines Commando Check for merge conflicts #14145: Pull request #4098 synchronize by spartanbobby
September 3, 2023 14:49 2m 11s
September 3, 2023 14:49 2m 11s
Adds Librarian Clothes to Synth Check for merge conflicts #14144: Pull request #4325 opened by QuickLode
September 3, 2023 14:11 13s
September 3, 2023 14:11 13s
Qol reorganize and update all the squads vendors. Check for merge conflicts #14143: Pull request #4324 synchronize by Huffie56
September 3, 2023 09:46 11s
September 3, 2023 09:46 11s
Qol reorganize and update all the squads vendors. Check for merge conflicts #14142: Pull request #4324 opened by Huffie56
September 3, 2023 08:55 14s
September 3, 2023 08:55 14s
Donut Spelling Error Fix (#4308) Check for merge conflicts #14141: Commit 9ae3701 pushed by github-merge-queue bot
September 3, 2023 05:44 4m 19s master
master
September 3, 2023 05:44 4m 19s
Brain damage tweaks (#4316) Check for merge conflicts #14140: Commit eaef948 pushed by github-merge-queue bot
September 3, 2023 05:30 4m 14s master
master
September 3, 2023 05:30 4m 14s
Donut Spelling Error Fix Check for merge conflicts #14139: Pull request #4308 synchronize by Steelpoint
September 3, 2023 04:49 17s
September 3, 2023 04:49 17s
Royal Marines Commando Check for merge conflicts #14138: Pull request #4098 synchronize by spartanbobby
September 3, 2023 01:29 30s
September 3, 2023 01:29 30s
Royal Marines Commando Check for merge conflicts #14137: Pull request #4098 ready_for_review by spartanbobby
September 3, 2023 01:29 12s
September 3, 2023 01:29 12s
Royal Marines Commando Check for merge conflicts #14136: Pull request #4098 synchronize by spartanbobby
September 3, 2023 01:29 2m 18s
September 3, 2023 01:29 2m 18s
Fixes perma helmet HUDs Check for merge conflicts #14135: Pull request #4322 opened by morrowwolf
September 3, 2023 00:53 15s
September 3, 2023 00:53 15s
New CIC uniform Check for merge conflicts #14134: Pull request #4320 synchronize by CapCamIII
September 2, 2023 22:09 16s
September 2, 2023 22:09 16s
Removes spec from first foxtrot call Check for merge conflicts #14133: Pull request #4321 opened by ihatethisengine
September 2, 2023 21:08 15s
September 2, 2023 21:08 15s
Unbreaks camo (#4312) Check for merge conflicts #14132: Commit e1148b4 pushed by github-merge-queue bot
September 2, 2023 20:56 4m 13s master
master
September 2, 2023 20:56 4m 13s
New CIC uniform Check for merge conflicts #14131: Pull request #4320 synchronize by CapCamIII
September 2, 2023 20:51 14s
September 2, 2023 20:51 14s
New CIC uniform Check for merge conflicts #14130: Pull request #4320 opened by CapCamIII
September 2, 2023 20:41 12s
September 2, 2023 20:41 12s
Yautja Legacy restoration & Yautja Sprite Fixes (#4033) Check for merge conflicts #14129: Commit 481a546 pushed by github-merge-queue bot
September 2, 2023 20:36 4m 14s master
master
September 2, 2023 20:36 4m 14s
Working Joes no longer get a cryo emergency kit Check for merge conflicts #14128: Pull request #4319 opened by Zonespace27
September 2, 2023 18:42 14s
September 2, 2023 18:42 14s
Overwatch Skill + All USCM Officers Can Now Overwatch Check for merge conflicts #14127: Pull request #4318 synchronize by Steelpoint
September 2, 2023 17:19 12s
September 2, 2023 17:19 12s
Overwatch Skill + All USCM Officers Can Now Overwatch Check for merge conflicts #14126: Pull request #4318 synchronize by Steelpoint
September 2, 2023 17:13 18s
September 2, 2023 17:13 18s
Overwatch Skill + All USCM Officers Can Now Overwatch Check for merge conflicts #14125: Pull request #4318 opened by Steelpoint
September 2, 2023 16:42 14s
September 2, 2023 16:42 14s
On-screen messages sounds Check for merge conflicts #14124: Pull request #4301 synchronize by ihatethisengine
September 2, 2023 08:26 15s
September 2, 2023 08:26 15s
Brain damage tweaks Check for merge conflicts #14123: Pull request #4316 opened by morrowwolf
September 2, 2023 05:39 15s
September 2, 2023 05:39 15s
Adds synthetic night vision (#4300) Check for merge conflicts #14122: Commit f4d9a56 pushed by github-merge-queue bot
September 2, 2023 05:18 4m 18s master
master
September 2, 2023 05:18 4m 18s