Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,082 workflow run results
4,082 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Dead Spider Sprite Fix (#4585) Check for merge conflicts #15126: Commit 68a487a pushed by github-merge-queue bot
October 5, 2023 05:06 4m 16s master
master
October 5, 2023 05:06 4m 16s
New goggle sprite Check for merge conflicts #15125: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:46 13s
October 5, 2023 04:46 13s
New goggle sprite Check for merge conflicts #15124: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:30 12s
October 5, 2023 04:30 12s
New goggle sprite Check for merge conflicts #15123: Pull request #4557 synchronize by irRegularGuy646
October 5, 2023 04:30 2m 14s
October 5, 2023 04:30 2m 14s
Hijack objectives Check for merge conflicts #15122: Pull request #4391 synchronize by morrowwolf
October 4, 2023 22:26 15s
October 4, 2023 22:26 15s
Nerfs sticky resin Check for merge conflicts #15121: Pull request #4588 opened by Mister-moon1
October 4, 2023 22:10 42s
October 4, 2023 22:10 42s
Hedge rav tweaks Check for merge conflicts #15120: Pull request #4587 opened by morrowwolf
October 4, 2023 22:05 18s
October 4, 2023 22:05 18s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #15119: Pull request #4586 opened by Huffie56
October 4, 2023 19:00 14s
October 4, 2023 19:00 14s
Adds drawing to tacmaps Check for merge conflicts #15118: Pull request #4475 synchronize by ghost
October 4, 2023 14:02 21s
October 4, 2023 14:02 21s
Adds drawing to tacmaps Check for merge conflicts #15117: Pull request #4475 synchronize by ghost
October 4, 2023 14:02 16s
October 4, 2023 14:02 16s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15116: Pull request #4574 ready_for_review by Huffie56
October 4, 2023 11:44 16s
October 4, 2023 11:44 16s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15115: Pull request #4574 synchronize by Huffie56
October 4, 2023 10:36 15s
October 4, 2023 10:36 15s
Floodlight rework (#4535) Check for merge conflicts #15114: Commit abded50 pushed by github-merge-queue bot
October 4, 2023 10:09 4m 21s master
master
October 4, 2023 10:09 4m 21s
Refactor gun cabinet code adding subtype for all the secure guncabinet/safes Check for merge conflicts #15113: Pull request #4574 synchronize by Huffie56
October 4, 2023 10:03 11s
October 4, 2023 10:03 11s
Get Flat Icon Fixes (#4505) Check for merge conflicts #15112: Commit eb614a6 pushed by github-merge-queue bot
October 4, 2023 09:53 4m 20s master
master
October 4, 2023 09:53 4m 20s
Fixes req door accesses (#4582) Check for merge conflicts #15111: Commit 0af0c9b pushed by github-merge-queue bot
October 4, 2023 09:38 4m 21s master
master
October 4, 2023 09:38 4m 21s
Minor QOL Buff To Handheld Crew Monitor (#4545) Check for merge conflicts #15110: Commit 2d8fa55 pushed by github-merge-queue bot
October 4, 2023 09:24 4m 18s master
master
October 4, 2023 09:24 4m 18s
Restore stat panel options to change font size (#4514) Check for merge conflicts #15109: Commit 28665f1 pushed by github-merge-queue bot
October 4, 2023 09:09 4m 18s master
master
October 4, 2023 09:09 4m 18s
Dead Spider Sprite Fix Check for merge conflicts #15108: Pull request #4585 synchronize by blackdragonTOW
October 4, 2023 06:23 16s
October 4, 2023 06:23 16s
Dead Spider Sprite Fix Check for merge conflicts #15107: Pull request #4585 opened by blackdragonTOW
October 4, 2023 04:26 13s
October 4, 2023 04:26 13s
Throws check tick all over the photo code Check for merge conflicts #15106: Pull request #4584 synchronize by morrowwolf
October 4, 2023 03:17 11s
October 4, 2023 03:17 11s
Throws check tick all over the photo code Check for merge conflicts #15105: Pull request #4584 opened by morrowwolf
October 4, 2023 03:09 17s
October 4, 2023 03:09 17s
Adds drawing to tacmaps Check for merge conflicts #15104: Pull request #4475 synchronize by ghost
October 4, 2023 02:52 12s
October 4, 2023 02:52 12s
Adds drawing to tacmaps Check for merge conflicts #15103: Pull request #4475 synchronize by ghost
October 4, 2023 02:42 17s
October 4, 2023 02:42 17s
Experimental xeno tackle changes Check for merge conflicts #15102: Pull request #4583 opened by morrowwolf
October 4, 2023 02:23 16s
October 4, 2023 02:23 16s
ProTip! You can narrow down the results and go further in time using created:<2023-10-04 or the other filters available.