Skip to content

Actions: discordia-space/CEV-Eris

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
23 workflow run results
23 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New sprites for grenade shells and new shells (#8233) Check for merge conflicts #1360: Commit 7196190 pushed by hyperioo
July 14, 2023 17:44 1m 11s master
master
July 14, 2023 17:44 1m 11s
Fix missing keyword args for linter (#8234) Check for merge conflicts #1359: Commit e78e4d6 pushed by hyperioo
July 14, 2023 17:11 1m 4s master
master
July 14, 2023 17:11 1m 4s
Adds graffiti + spraypaint (#8232) Check for merge conflicts #1358: Commit 5cab49e pushed by hyperioo
July 14, 2023 17:10 1m 26s master
master
July 14, 2023 17:10 1m 26s
KS-23 sprite tweaks (#8231) Check for merge conflicts #1357: Commit c654f9c pushed by hyperioo
July 14, 2023 16:11 1m 3s master
master
July 14, 2023 16:11 1m 3s
[DNM] [TEST] Erismed 4 tweaks (#8216) Check for merge conflicts #1356: Commit a5a0164 pushed by hyperioo
July 7, 2023 16:51 1m 12s master
master
July 7, 2023 16:51 1m 12s
IH Drip Update (#8227) Check for merge conflicts #1355: Commit 71932c9 pushed by TheShown911
July 7, 2023 13:26 1m 9s master
master
July 7, 2023 13:26 1m 9s
Brace rework (#8198) Check for merge conflicts #1354: Commit 3f71931 pushed by hyperioo
June 30, 2023 16:45 1m 0s master
master
June 30, 2023 16:45 1m 0s
Fixes missing epicenter runtime (#8201) Check for merge conflicts #1353: Commit abf1be2 pushed by hyperioo
June 30, 2023 16:40 1m 13s master
master
June 30, 2023 16:40 1m 13s
Leg tally fix (#8226) Check for merge conflicts #1352: Commit 83ac3a4 pushed by hyperioo
June 30, 2023 16:35 56s master
master
June 30, 2023 16:35 56s
Moebius hard-difficulty update (#8225) Check for merge conflicts #1351: Commit 7c79201 pushed by hyperioo
June 30, 2023 16:34 1m 7s master
master
June 30, 2023 16:34 1m 7s
Pipe and projectile GC fixes (#8221) Check for merge conflicts #1350: Commit a210e53 pushed by hyperioo
June 30, 2023 16:26 1m 7s master
master
June 30, 2023 16:26 1m 7s
SSchunks round 3. (#8213) Check for merge conflicts #1349: Commit 41ab997 pushed by hyperioo
June 30, 2023 16:24 1m 12s master
master
June 30, 2023 16:24 1m 12s
Sprite and Loadout updates [RTM] (#8218) Check for merge conflicts #1348: Commit 385fd6d pushed by hyperioo
June 23, 2023 18:14 1m 2s master
master
June 23, 2023 18:14 1m 2s
Pulsar disconnect now disconnects the pulsar (#8217) Check for merge conflicts #1347: Commit dd0cc2d pushed by hyperioo
June 23, 2023 17:49 1m 8s master
master
June 23, 2023 17:49 1m 8s
Quickequip hotfix (#8219) Check for merge conflicts #1346: Commit 378cb9c pushed by hyperioo
June 23, 2023 17:44 1m 3s master
master
June 23, 2023 17:44 1m 3s
Fix guild being able to make infinite credits (#8220) Check for merge conflicts #1345: Commit 90f80f6 pushed by hyperioo
June 23, 2023 17:31 1m 16s master
master
June 23, 2023 17:31 1m 16s
Actual Pulsar Relay Fix (#8214) Check for merge conflicts #1344: Commit e903191 pushed by hyperioo
June 23, 2023 17:26 1m 16s master
master
June 23, 2023 17:26 1m 16s
Revert "Metabolism changes (#8142)" (#8211) Check for merge conflicts #1343: Commit 2dc4454 pushed by Firefox13
June 16, 2023 19:21 53s master
master
June 16, 2023 19:21 53s
Metabolism changes (#8142) Check for merge conflicts #1342: Commit c8f0121 pushed by hyperioo
June 16, 2023 17:31 1m 4s master
master
June 16, 2023 17:31 1m 4s
Pulsar Relay (#8208) Check for merge conflicts #1341: Commit 258fa3c pushed by hyperioo
June 16, 2023 17:27 3m 4s master
master
June 16, 2023 17:27 3m 4s
Fix buckshot sprite (#8210) Check for merge conflicts #1340: Commit 80df1db pushed by hyperioo
June 16, 2023 17:21 53s master
master
June 16, 2023 17:21 53s
Last Tosshin Reference Eliminated (#8204) Check for merge conflicts #1339: Commit af813f4 pushed by hyperioo
June 16, 2023 17:21 1m 13s master
master
June 16, 2023 17:21 1m 13s
Reworks Bowls to hold both solids and liquids (#8203) Check for merge conflicts #1338: Commit d27271c pushed by hyperioo
June 16, 2023 17:19 1m 8s master
master
June 16, 2023 17:19 1m 8s