Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
343 workflow run results
343 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New Bunker Buster CAS Missile: GBU-67-EP 'Paveway XXI' Check for merge conflicts #11275: Pull request #3648 synchronize by blackdragonTOW
June 24, 2023 08:40 2m 4s
June 24, 2023 08:40 2m 4s
New Bunker Buster CAS Missile: GBU-67-EP 'Paveway XXI' Check for merge conflicts #11273: Pull request #3648 synchronize by blackdragonTOW
June 24, 2023 08:40 14s
June 24, 2023 08:40 14s
Email rewrites (#3701) Check for merge conflicts #11272: Commit db5a389 pushed by github-merge-queue bot
June 24, 2023 08:11 4m 14s master
master
June 24, 2023 08:11 4m 14s
Hive core and dead larvas. (#3700) Check for merge conflicts #11271: Commit 610c8b3 pushed by github-merge-queue bot
June 24, 2023 07:56 4m 13s master
master
June 24, 2023 07:56 4m 13s
Fix for dummy rotation in character setup. (#3699) Check for merge conflicts #11270: Commit 71455d4 pushed by github-merge-queue bot
June 24, 2023 07:41 4m 18s master
master
June 24, 2023 07:41 4m 18s
Fix yank object verb for others Check for merge conflicts #11269: Pull request #3705 opened by Drulikar
June 24, 2023 07:26 13s
June 24, 2023 07:26 13s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11268: Pull request #3644 synchronize by Drulikar
June 24, 2023 06:47 9s
June 24, 2023 06:47 9s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11267: Pull request #3644 ready_for_review by Drulikar
June 24, 2023 06:10 2m 7s
June 24, 2023 06:10 2m 7s
The weeds are hungry: Bodies for the weeds Check for merge conflicts #11266: Pull request #3644 synchronize by Drulikar
June 24, 2023 06:10 2m 14s
June 24, 2023 06:10 2m 14s
New Varadero revamp Check for merge conflicts #11265: Pull request #3676 synchronize by AnuvKH
June 23, 2023 23:19 13s
June 23, 2023 23:19 13s
Mines Boom: The PR Check for merge conflicts #11264: Pull request #3615 synchronize by LynxSolstice
June 23, 2023 22:32 14s
June 23, 2023 22:32 14s
Adds USCM Poncho To Synth Vendor (#3687) Check for merge conflicts #11263: Commit 39d6b77 pushed by github-merge-queue bot
June 23, 2023 22:12 4m 15s master
master
June 23, 2023 22:12 4m 15s
adds a visible line when using iv drips / bloodpacks Check for merge conflicts #11262: Pull request #3645 ready_for_review by realkhad
June 23, 2023 20:39 32s
June 23, 2023 20:39 32s
adds a visible line when using iv drips / bloodpacks Check for merge conflicts #11261: Pull request #3645 synchronize by realkhad
June 23, 2023 20:37 11s
June 23, 2023 20:37 11s
Devour now turns off lights (#3668) Check for merge conflicts #11260: Commit 9a51e5d pushed by github-merge-queue bot
June 23, 2023 20:03 4m 15s master
master
June 23, 2023 20:03 4m 15s
Devour now turns off lights Check for merge conflicts #11259: Pull request #3668 ready_for_review by morrowwolf
June 23, 2023 19:27 12s
June 23, 2023 19:27 12s
Devour now turns off lights Check for merge conflicts #11258: Pull request #3668 synchronize by morrowwolf
June 23, 2023 19:27 13s
June 23, 2023 19:27 13s
sanitizes some more player input (#3702) Check for merge conflicts #11257: Commit 39d2f98 pushed by morrowwolf
June 23, 2023 17:27 5m 26s master
master
June 23, 2023 17:27 5m 26s
Fix erronous flamer_tank is empty messages and add sfx to empty canis… Check for merge conflicts #11256: Commit 3aa4f19 pushed by github-merge-queue bot
June 23, 2023 17:26 6m 19s master
master
June 23, 2023 17:26 6m 19s
sanitizes some more player input Check for merge conflicts #11255: Pull request #3702 synchronize by harryob
June 23, 2023 17:13 3m 9s
June 23, 2023 17:13 3m 9s
sanitizes some more player input Check for merge conflicts #11254: Pull request #3702 opened by harryob
June 23, 2023 17:12 4m 0s
June 23, 2023 17:12 4m 0s
Fixes gun light attachment issues (#3696) Check for merge conflicts #11253: Commit f994b37 pushed by github-merge-queue bot
June 23, 2023 17:10 4m 18s master
master
June 23, 2023 17:10 4m 18s
refactor the code by addding a bunch of subtype for floor type. Check for merge conflicts #11252: Pull request #3581 ready_for_review by Huffie56
June 23, 2023 14:47 11s
June 23, 2023 14:47 11s
refactor the code by addding a bunch of subtype for floor type. Check for merge conflicts #11251: Pull request #3581 synchronize by Huffie56
June 23, 2023 14:40 12s
June 23, 2023 14:40 12s
Email rewrites Check for merge conflicts #11250: Pull request #3701 opened by Sargeantmuffinman
June 23, 2023 13:06 12s
June 23, 2023 13:06 12s
ProTip! You can narrow down the results and go further in time using created:<2023-06-23 or the other filters available.