Skip to content

Actions: PMC-Unga-Marines/Unga-Marines

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
652 workflow run results
652 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Increases sanity of mob swapping checks. (#130) Check for merge conflicts #127: Commit 6216b16 pushed by Tatarla
August 26, 2024 13:28 58s master
master
August 26, 2024 13:28 58s
Fixes most of failing unit tests. (#127) Check for merge conflicts #126: Commit 58d5939 pushed by Tatarla
August 26, 2024 13:03 40s master
master
August 26, 2024 13:03 40s
pretty (#128) Check for merge conflicts #125: Commit 0fe63be pushed by Helg2
August 25, 2024 13:37 39s master
master
August 25, 2024 13:37 39s
aaaaaaaaa Check for merge conflicts #124: Commit 930b7f4 pushed by homexp13
August 25, 2024 11:04 49s master
master
August 25, 2024 11:04 49s
node Check for merge conflicts #123: Commit 3a67950 pushed by homexp13
August 25, 2024 10:40 28s master
master
August 25, 2024 10:40 28s
fuck you Check for merge conflicts #122: Commit 160445e pushed by homexp13
August 25, 2024 10:22 33s master
master
August 25, 2024 10:22 33s
test? Check for merge conflicts #121: Commit 6797a0a pushed by homexp13
August 25, 2024 10:19 31s master
master
August 25, 2024 10:19 31s
eban_3000 (#125) Check for merge conflicts #120: Commit a61f8f5 pushed by Tatarla
August 25, 2024 07:03 28s master
master
August 25, 2024 07:03 28s
some chage TalOZ, tele in tank (#124) Check for merge conflicts #119: Commit c6882b3 pushed by Tatarla
August 25, 2024 07:00 28s master
master
August 25, 2024 07:00 28s
swap (#123) Check for merge conflicts #118: Commit d94852e pushed by Tatarla
August 25, 2024 06:59 34s master
master
August 25, 2024 06:59 34s
configs revert (#122) Check for merge conflicts #117: Commit 6ab75fd pushed by Tatarla
August 25, 2024 05:56 26s master
master
August 25, 2024 05:56 26s
Readds warlock and hivemind to evolution pull. (#121) Check for merge conflicts #116: Commit 847b043 pushed by Tatarla
August 25, 2024 05:47 26s master
master
August 25, 2024 05:47 26s
fix draw order not saving (#16128) (#120) Check for merge conflicts #115: Commit ee2525b pushed by Tatarla
August 25, 2024 05:46 26s master
master
August 25, 2024 05:46 26s
Adds squad robot name specific settings. Fixes that you can't join as… Check for merge conflicts #114: Commit e8ea44c pushed by Tatarla
August 25, 2024 05:46 29s master
master
August 25, 2024 05:46 29s
Fixes icons of handheld charger, advanced tweezers and alt optable. (… Check for merge conflicts #113: Commit 870304d pushed by Tatarla
August 25, 2024 05:46 53s master
master
August 25, 2024 05:46 53s
Fixes sprites of veteran uniform and shoes, also fixes separatist sho… Check for merge conflicts #112: Commit a11a369 pushed by Tatarla
August 25, 2024 05:45 32s master
master
August 25, 2024 05:45 32s
Fixes bypassing order limitations with keybinds. (#116) Check for merge conflicts #111: Commit c43c45b pushed by Tatarla
August 25, 2024 05:45 36s master
master
August 25, 2024 05:45 36s
Talos fixes. (#114) Check for merge conflicts #110: Commit bac0312 pushed by Tatarla
August 25, 2024 05:45 56s master
master
August 25, 2024 05:45 56s
hot fix (#115) Check for merge conflicts #109: Commit 89f61eb pushed by Helg2
August 24, 2024 18:23 35s master
master
August 24, 2024 18:23 35s
Delete tgmc-schema.sql Check for merge conflicts #108: Commit 084d8c3 pushed by Tatarla
August 24, 2024 10:50 31s master
master
August 24, 2024 10:50 31s
1 Check for merge conflicts #107: Commit a2bf42e pushed by Tatarla
August 24, 2024 10:50 44s master
master
August 24, 2024 10:50 44s
Talos some vend (#113) Check for merge conflicts #106: Commit 0d0fa15 pushed by Tatarla
August 24, 2024 06:26 37s master
master
August 24, 2024 06:26 37s
Ifex + some twix (#106) Check for merge conflicts #105: Commit bc0800f pushed by Tatarla
August 24, 2024 05:40 32s master
master
August 24, 2024 05:40 32s
Talos edit, remove guns, change sprite RO cap/uniform (#111) Check for merge conflicts #104: Commit 4bb3211 pushed by Tatarla
August 24, 2024 05:40 26s master
master
August 24, 2024 05:40 26s
Merge pull request #112 from Helg2/boomvest Check for merge conflicts #103: Commit ccd6104 pushed by homexp13
August 23, 2024 19:29 43s master
master
August 23, 2024 19:29 43s
ProTip! You can narrow down the results and go further in time using created:<2024-08-23 or the other filters available.