Skip to content

Actions: ss220-space/Paradise

Actions

Merge Conflict Detection

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
label_merge_conflicts.yml
13,958 workflow runs
13,958 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add: [bounty] Voice update Merge Conflict Detection #18577: Pull request #6326 synchronize by Pelmenik123
January 12, 2025 16:23 13s
January 12, 2025 16:23 13s
imageadd: Cosmic Carp Resprite Merge Conflict Detection #18576: Pull request #6352 synchronize by oi98
January 12, 2025 14:29 12s
January 12, 2025 14:29 12s
imageadd: Cosmic Carp Resprite Merge Conflict Detection #18575: Pull request #6352 opened by oi98
January 12, 2025 14:29 12s
January 12, 2025 14:29 12s
qol: tgchat lag fix caused by chat spam. (#6351) Merge Conflict Detection #18574: Commit 0c62134 pushed by BeebBeebBoob
January 12, 2025 07:31 2m 14s master220
master220
January 12, 2025 07:31 2m 14s
qol: tgchat lag fix caused by chat spam. Merge Conflict Detection #18573: Pull request #6351 opened by dageavtobusnick
January 12, 2025 02:33 12s
January 12, 2025 02:33 12s
add: SCS-3 Cage, alert qol Merge Conflict Detection #18572: Pull request #6350 opened by NuSanya
January 12, 2025 02:25 18s
January 12, 2025 02:25 18s
Abotch remap Merge Conflict Detection #18571: Pull request #5903 synchronize by tsoivecen199015
January 11, 2025 19:18 11s
January 11, 2025 19:18 11s
Revert "tweak: Assigns jobs first, antags second" (#6349) Merge Conflict Detection #18570: Commit 1ac743a pushed by BeebBeebBoob
January 11, 2025 17:31 2m 12s master220
master220
January 11, 2025 17:31 2m 12s
Revert "tweak: Assigns jobs first, antags second" Merge Conflict Detection #18569: Pull request #6349 opened by BeebBeebBoob
January 11, 2025 17:20 13s
January 11, 2025 17:20 13s
bugfix: Plasmamen Engineer uniform fix (#6348) Merge Conflict Detection #18568: Commit 7e3acfa pushed by BeebBeebBoob
January 11, 2025 17:16 2m 11s master220
master220
January 11, 2025 17:16 2m 11s
add: fishing Merge Conflict Detection #18567: Pull request #6150 synchronize by Antoonij
January 11, 2025 13:28 14s
January 11, 2025 13:28 14s
Abotch remap Merge Conflict Detection #18566: Pull request #5903 synchronize by tsoivecen199015
January 11, 2025 12:56 9s
January 11, 2025 12:56 9s
Abotch remap Merge Conflict Detection #18565: Pull request #5903 synchronize by tsoivecen199015
January 11, 2025 12:56 13s
January 11, 2025 12:56 13s
add: fishing Merge Conflict Detection #18564: Pull request #6150 synchronize by NightDawnFox
January 11, 2025 12:29 15s
January 11, 2025 12:29 15s
bugfix: Plasmamen Engineer uniform fix Merge Conflict Detection #18563: Pull request #6348 synchronize by oi98
January 11, 2025 12:12 10s
January 11, 2025 12:12 10s
bugfix: Plasmamen Engineer uniform fix Merge Conflict Detection #18562: Pull request #6348 opened by oi98
January 11, 2025 12:11 12s
January 11, 2025 12:11 12s
Abotch remap Merge Conflict Detection #18561: Pull request #5903 synchronize by tsoivecen199015
January 11, 2025 11:40 10s
January 11, 2025 11:40 10s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18560: Pull request #6346 synchronize by Antoonij
January 11, 2025 10:26 9s
January 11, 2025 10:26 9s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18559: Pull request #6346 synchronize by dictor31
January 11, 2025 10:20 10s
January 11, 2025 10:20 10s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18558: Pull request #6346 synchronize by dictor31
January 11, 2025 10:18 14s
January 11, 2025 10:18 14s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18557: Pull request #6346 synchronize by dictor31
January 11, 2025 09:56 10s
January 11, 2025 09:56 10s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18556: Pull request #6346 synchronize by dictor31
January 11, 2025 09:34 10s
January 11, 2025 09:34 10s
add: Increase SMMI TС cost & Overdrive ability Merge Conflict Detection #18555: Pull request #6346 synchronize by dictor31
January 11, 2025 09:26 11s
January 11, 2025 09:26 11s
refactor: is_hot get_heat refactor Merge Conflict Detection #18554: Pull request #6332 synchronize by BeebBeebBoob
January 11, 2025 09:00 12s
January 11, 2025 09:00 12s
refactor: replace some icon2base64 to DMicon (#6347) Merge Conflict Detection #18553: Commit 240753f pushed by BeebBeebBoob
January 11, 2025 08:58 2m 12s master220
master220
January 11, 2025 08:58 2m 12s