Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,705 workflow run results
1,705 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fixes lifepods still working after evac canceled Check for merge conflicts #14413: Pull request #4392 synchronize by morrowwolf
September 12, 2023 22:01 17s
September 12, 2023 22:01 17s
Fix fluff type check for map overrides Check for merge conflicts #14412: Pull request #4400 ready_for_review by Drulikar
September 12, 2023 21:31 16s
September 12, 2023 21:31 16s
Fix fluff type check for map overrides Check for merge conflicts #14411: Pull request #4400 synchronize by Drulikar
September 12, 2023 21:30 11s
September 12, 2023 21:30 11s
Paper Stamp Tweaks Check for merge conflicts #14410: Pull request #4406 synchronize by realforest2001
September 12, 2023 21:22 11s
September 12, 2023 21:22 11s
Paper Stamp Tweaks Check for merge conflicts #14409: Pull request #4406 synchronize by realforest2001
September 12, 2023 21:21 11s
September 12, 2023 21:21 11s
Revives CMB Black Market Investigation Check for merge conflicts #14408: Pull request #4405 synchronize by realforest2001
September 12, 2023 21:18 14s
September 12, 2023 21:18 14s
Paper Stamp Tweaks Check for merge conflicts #14407: Pull request #4406 synchronize by realforest2001
September 12, 2023 21:04 12s
September 12, 2023 21:04 12s
Paper Stamp Tweaks Check for merge conflicts #14406: Pull request #4406 synchronize by realforest2001
September 12, 2023 21:01 19s
September 12, 2023 21:01 19s
Paper Stamp Tweaks Check for merge conflicts #14405: Pull request #4406 synchronize by realforest2001
September 12, 2023 21:00 26s
September 12, 2023 21:00 26s
Paper Stamp Tweaks Check for merge conflicts #14404: Pull request #4406 opened by realforest2001
September 12, 2023 20:59 16s
September 12, 2023 20:59 16s
Revives CMB Black Market Investigation Check for merge conflicts #14403: Pull request #4405 opened by realforest2001
September 12, 2023 20:09 16s
September 12, 2023 20:09 16s
UPP Listening post Check for merge conflicts #14402: Pull request #4404 opened by insertnamehere123
September 12, 2023 17:53 16s
September 12, 2023 17:53 16s
Ghost notification for yautja self destruct Check for merge conflicts #14401: Pull request #4403 opened by morrowwolf
September 12, 2023 16:03 13s
September 12, 2023 16:03 13s
Fixes lifepods still working after evac canceled Check for merge conflicts #14400: Pull request #4392 ready_for_review by morrowwolf
September 12, 2023 15:19 12s
September 12, 2023 15:19 12s
Fixes lifepods still working after evac canceled Check for merge conflicts #14399: Pull request #4392 synchronize by morrowwolf
September 12, 2023 15:17 20s
September 12, 2023 15:17 20s
Stops shotgun juggling for real this time Check for merge conflicts #14398: Pull request #4402 opened by morrowwolf
September 12, 2023 14:23 16s
September 12, 2023 14:23 16s
Removes some mapped clown gear (#4388) Check for merge conflicts #14397: Commit 23fcb67 pushed by github-merge-queue bot
September 12, 2023 10:55 4m 17s master
master
September 12, 2023 10:55 4m 17s
[Balance] Hive weeds now look for a supporting structure (#4385) Check for merge conflicts #14396: Commit 692cc45 pushed by github-merge-queue bot
September 12, 2023 09:08 4m 17s master
master
September 12, 2023 09:08 4m 17s
Gives the M56D full auto (#4336) Check for merge conflicts #14395: Commit 1940d9e pushed by github-merge-queue bot
September 12, 2023 03:08 4m 13s master
master
September 12, 2023 03:08 4m 13s
Gives the M56D full auto Check for merge conflicts #14394: Pull request #4336 synchronize by Zonespace27
September 12, 2023 02:52 2m 17s
September 12, 2023 02:52 2m 17s
Fix fluff type check for map overrides Check for merge conflicts #14393: Pull request #4400 opened by Drulikar
September 12, 2023 00:15 16s
September 12, 2023 00:15 16s
Layer coffins above beds Check for merge conflicts #14392: Pull request #4399 synchronize by Zonespace27
September 12, 2023 00:01 16s
September 12, 2023 00:01 16s
Layer coffins above beds Check for merge conflicts #14391: Pull request #4399 opened by Zonespace27
September 12, 2023 00:00 12s
September 12, 2023 00:00 12s
Yautja Weapon Gimmicks Check for merge conflicts #14390: Pull request #4047 ready_for_review by realforest2001
September 11, 2023 23:36 12s
September 11, 2023 23:36 12s
Yautja Weapon Gimmicks Check for merge conflicts #14389: Pull request #4047 synchronize by realforest2001
September 11, 2023 23:35 15s
September 11, 2023 23:35 15s