Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
12,279 workflow run results
12,279 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #24990: Pull request #6783 ready_for_review by LC4492
July 24, 2024 21:30 9s
July 24, 2024 21:30 9s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #24989: Pull request #6783 synchronize by LC4492
July 24, 2024 21:26 14s
July 24, 2024 21:26 14s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #24988: Pull request #6786 synchronize by blackcrystall
July 24, 2024 20:00 12s
July 24, 2024 20:00 12s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #24987: Pull request #6786 synchronize by blackcrystall
July 24, 2024 19:58 10s
July 24, 2024 19:58 10s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #24986: Pull request #6786 synchronize by blackcrystall
July 24, 2024 19:58 9s
July 24, 2024 19:58 9s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #24985: Pull request #6786 synchronize by blackcrystall
July 24, 2024 19:54 10s
July 24, 2024 19:54 10s
Hold my Beer (Fix of hi intellligent data lookup in TGUI Who/Staff Who Check for merge conflicts #24984: Pull request #6786 opened by blackcrystall
July 24, 2024 19:52 14s
July 24, 2024 19:52 14s
Rank Change Experiment Check for merge conflicts #24983: Pull request #6295 synchronize by realforest2001
July 24, 2024 18:42 13s
July 24, 2024 18:42 13s
CMB Riot Control Unit Check for merge conflicts #24982: Pull request #6649 synchronize by Blundir
July 24, 2024 18:17 11s
July 24, 2024 18:17 11s
lifeboat can now be unhacked by pilot Check for merge conflicts #24981: Pull request #6661 ready_for_review by zzzmike
July 24, 2024 12:31 12s
July 24, 2024 12:31 12s
lifeboat can now be unhacked by pilot Check for merge conflicts #24980: Pull request #6661 synchronize by zzzmike
July 24, 2024 12:27 9s
July 24, 2024 12:27 9s
lifeboat can now be unhacked by pilot Check for merge conflicts #24979: Pull request #6661 synchronize by zzzmike
July 24, 2024 12:18 11s
July 24, 2024 12:18 11s
lifeboat can now be unhacked by pilot Check for merge conflicts #24978: Pull request #6661 synchronize by zzzmike
July 24, 2024 12:03 16s
July 24, 2024 12:03 16s
lifeboat can now be unhacked by pilot Check for merge conflicts #24977: Pull request #6661 synchronize by zzzmike
July 24, 2024 11:57 15s
July 24, 2024 11:57 15s
lifeboat can now be unhacked by pilot Check for merge conflicts #24976: Pull request #6661 synchronize by zzzmike
July 24, 2024 11:54 12s
July 24, 2024 11:54 12s
lifeboat can now be unhacked by pilot Check for merge conflicts #24975: Pull request #6661 synchronize by zzzmike
July 24, 2024 11:44 11s
July 24, 2024 11:44 11s
/obj/item/device/suit_cooling_unit removal (#6722) Check for merge conflicts #24974: Commit d334ed3 pushed by github-merge-queue bot
July 24, 2024 10:04 4m 25s master
master
July 24, 2024 10:04 4m 25s
M47A2 Offensive Handgun Check for merge conflicts #24973: Pull request #6734 synchronize by zc-byte-boxer
July 24, 2024 07:23 10s
July 24, 2024 07:23 10s
M47A2 Offensive Handgun Check for merge conflicts #24972: Pull request #6734 synchronize by zc-byte-boxer
July 24, 2024 06:41 10s
July 24, 2024 06:41 10s
M47A2 Offensive Handgun Check for merge conflicts #24971: Pull request #6734 synchronize by zc-byte-boxer
July 24, 2024 05:05 2m 13s
July 24, 2024 05:05 2m 13s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #24970: Pull request #6783 synchronize by LC4492
July 23, 2024 22:41 12s
July 23, 2024 22:41 12s
CMB Riot Control Unit Check for merge conflicts #24969: Pull request #6649 synchronize by Blundir
July 23, 2024 20:40 15s
July 23, 2024 20:40 15s
CMB Riot Control Unit Check for merge conflicts #24968: Pull request #6649 synchronize by Blundir
July 23, 2024 19:36 17s
July 23, 2024 19:36 17s
CMB Riot Control Unit Check for merge conflicts #24967: Pull request #6649 synchronize by Blundir
July 23, 2024 19:01 17s
July 23, 2024 19:01 17s
New "Bulky" computers, small bug fixes also related to computers, addition of altitude controller to the CIC Check for merge conflicts #24966: Pull request #6783 synchronize by LC4492
July 23, 2024 18:23 14s
July 23, 2024 18:23 14s