Skip to content

Actions: DaedalusDock/daedalusdock

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
505 workflow runs
505 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

fix button css (#1088) Check for merge conflicts #787: Commit 5ad9b52 pushed by Kapu1178
September 26, 2024 05:46 44s master
master
September 26, 2024 05:46 44s
Update TGS DMAPI (#1087) Check for merge conflicts #786: Commit 53469f8 pushed by francinum
September 5, 2024 18:18 43s master
master
September 5, 2024 18:18 43s
mugs are a subtype of glass, fixes icon bug on "beagle mug" [IMPORTAN… Check for merge conflicts #785: Commit e1ef915 pushed by Kapu1178
September 5, 2024 03:15 53s master
master
September 5, 2024 03:15 53s
Adds the Mancrowave (#1083) Check for merge conflicts #784: Commit 375c3a9 pushed by Kapu1178
September 4, 2024 02:08 53s master
master
September 4, 2024 02:08 53s
Dying now shows a cause of death (#1082) Check for merge conflicts #783: Commit f92ab11 pushed by Kapu1178
August 27, 2024 23:53 53s master
master
August 27, 2024 23:53 53s
WOOOOOOOOO (#1071) Check for merge conflicts #782: Commit d77d3a1 pushed by Kapu1178
August 25, 2024 04:22 29s master
master
August 25, 2024 04:22 29s
8.15.24 bugs (#1070) Check for merge conflicts #781: Commit 8d98206 pushed by Kapu1178
August 25, 2024 04:22 57s master
master
August 25, 2024 04:22 57s
Sleeping Tweaks (#1077) Check for merge conflicts #780: Commit e8a934a pushed by Kapu1178
August 25, 2024 04:22 1m 14s master
master
August 25, 2024 04:22 1m 14s
Merge branch 'master' of github.com:DaedalusDock/daedalusdock into pr… Check for merge conflicts #779: Commit 3794847 pushed by Kapu1178
August 22, 2024 06:42 41s project/atlas
project/atlas
August 22, 2024 06:42 41s
tgs rustg http handler (#1076) Check for merge conflicts #778: Commit 9e92437 pushed by Kapu1178
August 22, 2024 06:26 30s master
master
August 22, 2024 06:26 30s
fix catatonic (#1075) Check for merge conflicts #777: Commit ad1d8e9 pushed by Kapu1178
August 22, 2024 06:26 53s master
master
August 22, 2024 06:26 53s
Python-related Repo Gruntwork (#1081) Check for merge conflicts #776: Commit ba93634 pushed by francinum
August 22, 2024 03:27 42s master
master
August 22, 2024 03:27 42s
Compresses maintambience.ogg (#1079) Check for merge conflicts #775: Commit db5d623 pushed by francinum
August 22, 2024 02:18 41s master
master
August 22, 2024 02:18 41s
Ports 2 PRs related to client movement: tg#8146, tg#85379 (#1051) Check for merge conflicts #774: Commit 2531422 pushed by Kapu1178
August 18, 2024 07:10 42s master
master
August 18, 2024 07:10 42s
fix clown title (#1072) Check for merge conflicts #773: Commit d1bd796 pushed by Kapu1178
August 16, 2024 16:47 53s master
master
August 16, 2024 16:47 53s
Metabolism Fixes (#1055) Check for merge conflicts #772: Commit 1f74177 pushed by Kapu1178
August 15, 2024 19:29 50s master
master
August 15, 2024 19:29 50s
Disposals tweaks (#1058) Check for merge conflicts #771: Commit 61d54e2 pushed by Kapu1178
August 15, 2024 02:58 42s master
master
August 15, 2024 02:58 42s
Ports tg#84247 (#1047) Check for merge conflicts #770: Commit 9ea2fb5 pushed by Kapu1178
August 15, 2024 02:58 30s master
master
August 15, 2024 02:58 30s
Fixed lights stopping emitting light in some situations (#1048) Check for merge conflicts #769: Commit db02b35 pushed by Kapu1178
August 15, 2024 02:58 38s master
master
August 15, 2024 02:58 38s
Add our_view to screen_loc_to_offset in view_audit_buttons (#1050) Check for merge conflicts #768: Commit 691e0d5 pushed by Kapu1178
August 15, 2024 02:58 40s master
master
August 15, 2024 02:58 40s
Fixes #1065 (#1069) Check for merge conflicts #767: Commit e063fd2 pushed by Kapu1178
August 15, 2024 01:50 39s master
master
August 15, 2024 01:50 39s
Update TGS DMAPI (#1063) Check for merge conflicts #766: Commit cd2f0de pushed by francinum
August 15, 2024 01:33 43s master
master
August 15, 2024 01:33 43s
extra skill stuff (#1054) Check for merge conflicts #765: Commit 9d946ad pushed by Kapu1178
August 13, 2024 19:26 52s master
master
August 13, 2024 19:26 52s
Update TGS DMAPI (#1062) Check for merge conflicts #764: Commit 26ae565 pushed by francinum
August 11, 2024 15:54 37s master
master
August 11, 2024 15:54 37s
Update TGS Auto-Updater (#1061) Check for merge conflicts #763: Commit db1d48a pushed by Kapu1178
August 10, 2024 21:12 49s master
master
August 10, 2024 21:12 49s