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,535 workflow run results
1,535 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Project ARES: Admin Console Check for merge conflicts #14171: Pull request #4182 synchronize by realforest2001
September 4, 2023 09:44 9m 17s
September 4, 2023 09:44 9m 17s
Fix restore old dmifiles to avoid missing sprite. Check for merge conflicts #14170: Pull request #4327 ready_for_review by Huffie56
September 4, 2023 09:34 13m 21s
September 4, 2023 09:34 13m 21s
Fix restore old dmifiles to avoid missing sprite. Check for merge conflicts #14169: Pull request #4327 synchronize by Huffie56
September 4, 2023 09:26 16m 6s
September 4, 2023 09:26 16m 6s
Project ARES: Admin Console Check for merge conflicts #14168: Pull request #4182 synchronize by realforest2001
September 4, 2023 09:21 8m 0s
September 4, 2023 09:21 8m 0s
ARES Change Holder Check for merge conflicts #14167: Pull request #4224 synchronize by realforest2001
September 4, 2023 09:21 2m 3s
September 4, 2023 09:21 2m 3s
Project ARES: Adds more APOLLO consoles Check for merge conflicts #14166: Pull request #4208 synchronize by realforest2001
September 4, 2023 09:21 19s
September 4, 2023 09:21 19s
Project ARES: Logging tweaks & updates Check for merge conflicts #14165: Pull request #4225 synchronize by realforest2001
September 4, 2023 09:21 2m 14s
September 4, 2023 09:21 2m 14s
Project ARES: Functional Access Tickets Check for merge conflicts #14164: Pull request #4111 synchronize by realforest2001
September 4, 2023 09:21 2m 14s
September 4, 2023 09:21 2m 14s
Adds Helmets + Visor To Synth Vendor | Grey M10 Helmet Addition (#4306) Check for merge conflicts #14163: Commit 07da794 pushed by github-merge-queue bot
September 4, 2023 07:37 4m 18s master
master
September 4, 2023 07:37 4m 18s
Removes debuffs from the folded M39 stock (#4305) Check for merge conflicts #14162: Commit 8cbf544 pushed by github-merge-queue bot
September 4, 2023 07:22 4m 18s master
master
September 4, 2023 07:22 4m 18s
overlay limbs for improved client performance (#4290) Check for merge conflicts #14161: Commit 3d8b380 pushed by github-merge-queue bot
September 4, 2023 07:12 2m 15s master
master
September 4, 2023 07:12 2m 15s
Fixes perma helmet HUDs (#4322) Check for merge conflicts #14160: Commit 010c181 pushed by github-merge-queue bot
September 4, 2023 06:52 2m 16s master
master
September 4, 2023 06:52 2m 16s
Revert "refactor : clean dmi file extract spritten hiden inside other sprites direction. removing sprite change from dmm files." Check for merge conflicts #14159: Pull request #4332 opened by morrowwolf
September 4, 2023 06:45 42s
September 4, 2023 06:45 42s
Working Joes no longer get a cryo emergency kit (#4319) Check for merge conflicts #14158: Commit 5f9afd0 pushed by github-merge-queue bot
September 4, 2023 06:41 4m 19s master
master
September 4, 2023 06:41 4m 19s
Clusters turning into pylons expand properly Check for merge conflicts #14157: Pull request #4331 opened by morrowwolf
September 4, 2023 06:25 16s
September 4, 2023 06:25 16s
Royal Marines Commando Check for merge conflicts #14156: Pull request #4098 synchronize by spartanbobby
September 4, 2023 02:07 12s
September 4, 2023 02:07 12s
For the Hive! ghost notification Check for merge conflicts #14155: Pull request #4329 opened by morrowwolf
September 4, 2023 01:58 15s
September 4, 2023 01:58 15s
CAS Fire Mission ghost notification Check for merge conflicts #14154: Pull request #4328 opened by morrowwolf
September 4, 2023 01:48 2m 13s
September 4, 2023 01:48 2m 13s
Crashable lifeboats and early launch Check for merge conflicts #14153: Pull request #4314 synchronize by morrowwolf
September 4, 2023 00:48 14s
September 4, 2023 00:48 14s
Crashable lifeboats and early launch Check for merge conflicts #14152: Pull request #4314 synchronize by morrowwolf
September 4, 2023 00:40 12s
September 4, 2023 00:40 12s
Qol reorganize and update all the squads vendors. Check for merge conflicts #14151: Pull request #4324 ready_for_review by Huffie56
September 3, 2023 19:28 15s
September 3, 2023 19:28 15s
Fix restore old dmifiles to avoid missing sprite. Check for merge conflicts #14150: Pull request #4327 ready_for_review by Huffie56
September 3, 2023 17:01 11s
September 3, 2023 17:01 11s
Fix restore old dmifiles to avoid missing sprite. Check for merge conflicts #14149: Pull request #4327 opened by Huffie56
September 3, 2023 16:55 15s
September 3, 2023 16:55 15s
Ship vs ship revival Check for merge conflicts #14148: Pull request #4326 synchronize by Tsunamico
September 3, 2023 16:42 11s
September 3, 2023 16:42 11s
Ship vs ship revival Check for merge conflicts #14147: Pull request #4326 opened by Tsunamico
September 3, 2023 16:25 12s
September 3, 2023 16:25 12s