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
11,232 workflow run results
11,232 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

qol: recharge spell million istypes removal Merge Conflict Detection #16248: Pull request #5915 synchronize by Daeberdir
October 10, 2024 10:41 14s
October 10, 2024 10:41 14s
add: Sorting vending machines by files. New green shield spawn clothes for CentComm Merge Conflict Detection #16247: Pull request #6005 opened by Rafnik02
October 10, 2024 10:36 13s
October 10, 2024 10:36 13s
BugFix: fix some inhand sprites Merge Conflict Detection #16246: Pull request #6004 opened by kartowkar
October 10, 2024 10:14 14s
October 10, 2024 10:14 14s
Add: ASHIE UPDATE Merge Conflict Detection #16245: Pull request #5875 synchronize by Antoonij
October 10, 2024 09:29 13s
October 10, 2024 09:29 13s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16244: Pull request #5993 synchronize by Anorak2024
October 10, 2024 06:05 15s
October 10, 2024 06:05 15s
Bugfix: Borer spell datum fix (#6002) Merge Conflict Detection #16243: Commit 7a79608 pushed by github-merge-queue bot
October 10, 2024 03:10 2m 13s master220
master220
October 10, 2024 03:10 2m 13s
bugfix: permeability of adjusted mask Merge Conflict Detection #16242: Pull request #6003 synchronize by LiquidPotroh
October 10, 2024 00:07 11s
October 10, 2024 00:07 11s
bugfix: permeability of adjusted mask Merge Conflict Detection #16241: Pull request #6003 opened by LiquidPotroh
October 10, 2024 00:04 11s
October 10, 2024 00:04 11s
Add: Disease - Babylonian Fever Merge Conflict Detection #16240: Pull request #5997 synchronize by timchigaming
October 9, 2024 20:05 12s
October 9, 2024 20:05 12s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16239: Pull request #5993 synchronize by Anorak2024
October 9, 2024 19:35 16s
October 9, 2024 19:35 16s
Automatic changelog generation Merge Conflict Detection #16238: Commit 7cc20b5 pushed by changelog-bot bot
October 9, 2024 17:30 2m 18s master220
master220
October 9, 2024 17:30 2m 18s
Bugfix: Borer spell datum fix Merge Conflict Detection #16237: Pull request #6002 opened by kartowkar
October 9, 2024 15:23 15s
October 9, 2024 15:23 15s
bugfix: eatable component multitool fix (#6001) Merge Conflict Detection #16236: Commit 2346962 pushed by Bizzonium
October 9, 2024 14:48 2m 12s master220
master220
October 9, 2024 14:48 2m 12s
bugfix: eatable component multitool fix Merge Conflict Detection #16235: Pull request #6001 opened by kartowkar
October 9, 2024 12:24 19s
October 9, 2024 12:24 19s
add: health insurance Merge Conflict Detection #16234: Pull request #5921 synchronize by Anorak2024
October 9, 2024 11:21 10s
October 9, 2024 11:21 10s
Add: Disease - Babylonian Fever Merge Conflict Detection #16233: Pull request #5997 synchronize by timchigaming
October 9, 2024 10:54 9m 36s
October 9, 2024 10:54 9m 36s
Add: ASHIE UPDATE Merge Conflict Detection #16232: Pull request #5875 synchronize by Antoonij
October 9, 2024 07:29 11s
October 9, 2024 07:29 11s
Add: ASHIE UPDATE Merge Conflict Detection #16231: Pull request #5875 synchronize by Antoonij
October 9, 2024 06:59 14s
October 9, 2024 06:59 14s
add: Syndicate affiliates 2.0 Merge Conflict Detection #16230: Pull request #5993 synchronize by Anorak2024
October 9, 2024 06:03 2m 13s
October 9, 2024 06:03 2m 13s
refactor: Upgrade vomit from life cycle to debuff (#5931) Merge Conflict Detection #16229: Commit bde24da pushed by github-merge-queue bot
October 8, 2024 23:04 2m 14s master220
master220
October 8, 2024 23:04 2m 14s
refactor: Upgrade vomit from life cycle to debuff Merge Conflict Detection #16228: Pull request #5931 synchronize by Daeberdir
October 8, 2024 22:50 11s
October 8, 2024 22:50 11s
refactor: Upgrade vomit from life cycle to debuff Merge Conflict Detection #16227: Pull request #5931 synchronize by Daeberdir
October 8, 2024 22:49 10s
October 8, 2024 22:49 10s
refactor: Upgrade vomit from life cycle to debuff Merge Conflict Detection #16226: Pull request #5931 synchronize by Daeberdir
October 8, 2024 22:20 11s
October 8, 2024 22:20 11s
refactor: Upgrade vomit from life cycle to debuff Merge Conflict Detection #16225: Pull request #5931 synchronize by Daeberdir
October 8, 2024 22:19 14s
October 8, 2024 22:19 14s
bugfix: dupe of materials (#5998) Merge Conflict Detection #16224: Commit 44e06a1 pushed by github-merge-queue bot
October 8, 2024 20:22 2m 15s master220
master220
October 8, 2024 20:22 2m 15s