Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,300 workflow run results
7,300 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fix CMB ERT & Path Based ERT Calling (#5755) Check for merge conflicts #19901: Commit c15e764 pushed by github-merge-queue bot
February 21, 2024 20:34 4m 16s master
master
February 21, 2024 20:34 4m 16s
Ports Mapping Backend updates Check for merge conflicts #19900: Pull request #5165 synchronize by harryob
February 21, 2024 20:20 13s
February 21, 2024 20:20 13s
Ports Mapping Backend updates Check for merge conflicts #19899: Pull request #5165 ready_for_review by harryob
February 21, 2024 19:33 1m 34s
February 21, 2024 19:33 1m 34s
Ports Mapping Backend updates Check for merge conflicts #19898: Pull request #5165 synchronize by harryob
February 21, 2024 19:31 16s
February 21, 2024 19:31 16s
Ports Mapping Backend updates Check for merge conflicts #19897: Pull request #5165 synchronize by harryob
February 21, 2024 19:30 13s
February 21, 2024 19:30 13s
Ports Mapping Backend updates Check for merge conflicts #19896: Pull request #5165 reopened by harryob
February 21, 2024 19:30 11s
February 21, 2024 19:30 11s
Dropship turf direction sprites Check for merge conflicts #19895: Pull request #3642 ready_for_review by mullenpaul
February 21, 2024 19:27 1m 46s
February 21, 2024 19:27 1m 46s
Dropship turf direction sprites Check for merge conflicts #19894: Pull request #3642 synchronize by mullenpaul
February 21, 2024 19:26 13s
February 21, 2024 19:26 13s
Fix burrower lifeboat tunneling Check for merge conflicts #19893: Pull request #5778 opened by Drulikar
February 21, 2024 17:20 11s
February 21, 2024 17:20 11s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19892: Pull request #5776 synchronize by Red-byte3D
February 21, 2024 16:41 10s
February 21, 2024 16:41 10s
Relay Ping Browser Check for merge conflicts #19891: Pull request #5777 opened by Drulikar
February 21, 2024 16:36 10s
February 21, 2024 16:36 10s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19890: Pull request #5776 synchronize by Red-byte3D
February 21, 2024 16:29 13s
February 21, 2024 16:29 13s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19889: Pull request #5776 synchronize by Red-byte3D
February 21, 2024 16:24 11s
February 21, 2024 16:24 11s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19888: Pull request #5776 synchronize by Red-byte3D
February 21, 2024 16:23 11s
February 21, 2024 16:23 11s
[WORK IN PROGRESS] Drone tier three [reaper is a placeholder name] Check for merge conflicts #19887: Pull request #5776 opened by Red-byte3D
February 21, 2024 16:20 12s
February 21, 2024 16:20 12s
Adds a new Nightmare Insert on LV-624 Check for merge conflicts #19886: Pull request #5652 synchronize by BadAtThisGame302
February 21, 2024 14:21 24s
February 21, 2024 14:21 24s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19885: Pull request #5763 ready_for_review by Huffie56
February 21, 2024 13:55 11s
February 21, 2024 13:55 11s
TGUI input list search fix Check for merge conflicts #19884: Pull request #5775 opened by SabreML
February 21, 2024 13:40 13s
February 21, 2024 13:40 13s
refactor barricades files to hopfully have a more constant interactio… Check for merge conflicts #19883: Commit 8b99bc2 pushed by github-merge-queue bot
February 21, 2024 13:13 4m 15s master
master
February 21, 2024 13:13 4m 15s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19882: Pull request #5763 synchronize by Huffie56
February 21, 2024 12:48 13s
February 21, 2024 12:48 13s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19881: Pull request #5763 ready_for_review by Huffie56
February 21, 2024 12:29 10s
February 21, 2024 12:29 10s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19880: Pull request #5763 synchronize by Huffie56
February 21, 2024 12:20 13s
February 21, 2024 12:20 13s
Map: Bigred change south lambda padlock and turned it into a checkpoint. Check for merge conflicts #19879: Pull request #5763 synchronize by Huffie56
February 21, 2024 12:06 15s
February 21, 2024 12:06 15s
refactor barricades files to hopfully have a more constant interaction when trying to fix them with welder. Check for merge conflicts #19878: Pull request #5609 ready_for_review by Huffie56
February 21, 2024 11:23 11s
February 21, 2024 11:23 11s
Refactor marine_armor.dm and split it into multiples files. Check for merge conflicts #19877: Pull request #5740 ready_for_review by Huffie56
February 21, 2024 11:02 13s
February 21, 2024 11:02 13s