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
14,239 workflow runs
14,239 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

qol: robots translation Merge Conflict Detection #17090: Pull request #6130 synchronize by PlayerUnknown14
November 7, 2024 05:44 12s
November 7, 2024 05:44 12s
bugfix: singularity hammer no longer pulling ghosts Merge Conflict Detection #17089: Pull request #6143 synchronize by Daeberdir
November 7, 2024 04:42 10s
November 7, 2024 04:42 10s
bugfix: singularity hammer no longer pulling ghosts Merge Conflict Detection #17088: Pull request #6143 synchronize by Daeberdir
November 7, 2024 04:34 18s
November 7, 2024 04:34 18s
bugfix: singularity hammer no longer pulling ghosts Merge Conflict Detection #17087: Pull request #6143 synchronize by Daeberdir
November 7, 2024 04:25 11s
November 7, 2024 04:25 11s
qol: robots translation Merge Conflict Detection #17086: Pull request #6130 synchronize by PlayerUnknown14
November 7, 2024 04:05 14s
November 7, 2024 04:05 14s
qol: robots translation Merge Conflict Detection #17085: Pull request #6130 synchronize by PlayerUnknown14
November 7, 2024 01:51 12s
November 7, 2024 01:51 12s
bugfix: singularity hammer no longer pulling ghosts Merge Conflict Detection #17084: Pull request #6143 opened by KefirTT
November 6, 2024 18:48 13s
November 6, 2024 18:48 13s
experimental: New() -> Initialize() organs migration. Merge Conflict Detection #17083: Pull request #6137 ready_for_review by Daeberdir
November 6, 2024 18:02 12s
November 6, 2024 18:02 12s
experimental: New() -> Initialize() organs migration. Merge Conflict Detection #17082: Pull request #6137 synchronize by Daeberdir
November 6, 2024 18:02 12s
November 6, 2024 18:02 12s
add: Ashwalkers survival update Merge Conflict Detection #17081: Pull request #5893 synchronize by MeowEmiya
November 6, 2024 17:39 12s
November 6, 2024 17:39 12s
bugfix: Syndicate turrets are now dense (#6142) Merge Conflict Detection #17080: Commit 0890adb pushed by Vladisvell
November 6, 2024 16:35 2m 14s master220
master220
November 6, 2024 16:35 2m 14s
bugfix: Syndicate turrets are now dense Merge Conflict Detection #17079: Pull request #6142 opened by Vladisvell
November 6, 2024 16:34 11s
November 6, 2024 16:34 11s
bugfix: Wooden wall creation fix (#6141) Merge Conflict Detection #17078: Commit 1792ee6 pushed by Vladisvell
November 6, 2024 16:29 15s master220
master220
November 6, 2024 16:29 15s
bugfix: Wooden wall creation fix Merge Conflict Detection #17077: Pull request #6141 opened by Vladisvell
November 6, 2024 16:29 2m 20s
November 6, 2024 16:29 2m 20s
add: request console cart in pda[bounty] Merge Conflict Detection #17076: Pull request #5990 synchronize by dageavtobusnick
November 6, 2024 15:12 14s
November 6, 2024 15:12 14s
add: request console cart in pda[bounty] Merge Conflict Detection #17075: Pull request #5990 synchronize by dageavtobusnick
November 6, 2024 15:06 14s
November 6, 2024 15:06 14s
bugfix: some rituals fix (#6140) Merge Conflict Detection #17074: Commit 4395b68 pushed by Vladisvell
November 6, 2024 15:02 2m 17s master220
master220
November 6, 2024 15:02 2m 17s
bugfix: some rituals fix Merge Conflict Detection #17073: Pull request #6140 opened by Antoonij
November 6, 2024 14:50 21s
November 6, 2024 14:50 21s
Automatic changelog generation Merge Conflict Detection #17072: Commit b5a1273 pushed by changelog-bot bot
November 6, 2024 14:31 2m 12s master220
master220
November 6, 2024 14:31 2m 12s
refactor/update: Devil Merge Conflict Detection #17071: Pull request #5944 synchronize by Antoonij
November 6, 2024 14:30 9s
November 6, 2024 14:30 9s
bugfix: ash walker rituals fix (#6138) Merge Conflict Detection #17070: Commit 700cf3f pushed by Vladisvell
November 6, 2024 14:28 2m 16s master220
master220
November 6, 2024 14:28 2m 16s
bugfix: some rituals fix Merge Conflict Detection #17069: Pull request #6138 synchronize by Antoonij
November 6, 2024 14:21 11s
November 6, 2024 14:21 11s
bugfix: some rituals fix Merge Conflict Detection #17068: Pull request #6138 synchronize by Antoonij
November 6, 2024 14:20 15s
November 6, 2024 14:20 15s
bugfix: Fixed headphones not unable to play songs (#6139) Merge Conflict Detection #17067: Commit c610731 pushed by Vladisvell
November 6, 2024 14:02 20s master220
master220
November 6, 2024 14:02 20s
bugfix: Fixed headphones not unable to play songs Merge Conflict Detection #17066: Pull request #6139 opened by Vladisvell
November 6, 2024 14:02 2m 17s
November 6, 2024 14:02 2m 17s