Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
15,654 workflow run results
15,654 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Fax Responders TestMerge Collection Check for merge conflicts #29537: Pull request #7165 synchronize by realforest2001
November 24, 2024 16:37 12s
November 24, 2024 16:37 12s
Fax Responders TestMerge Collection Check for merge conflicts #29536: Pull request #7165 synchronize by realforest2001
November 24, 2024 16:30 12s
November 24, 2024 16:30 12s
Fax Responders TestMerge Collection Check for merge conflicts #29535: Pull request #7165 synchronize by realforest2001
November 24, 2024 16:28 16s
November 24, 2024 16:28 16s
Project ARES: Synthetic Reset Key Check for merge conflicts #29533: Pull request #6120 reopened by realforest2001
November 24, 2024 15:50 16s
November 24, 2024 15:50 16s
Project ARES: Synthetic Reset Key Check for merge conflicts #29534: Pull request #6120 synchronize by realforest2001
November 24, 2024 15:50 16s
November 24, 2024 15:50 16s
Adds ability for admins to end round with a custom ending + upp ending icon Check for merge conflicts #29532: Pull request #7548 synchronize by Blundir
November 24, 2024 14:29 9s
November 24, 2024 14:29 9s
SSV Rostock - UPP Warship Map Check for merge conflicts #29531: Pull request #7525 synchronize by Steelpoint
November 24, 2024 14:22 15s
November 24, 2024 14:22 15s
SSV Rostock - UPP Warship Map Check for merge conflicts #29530: Pull request #7525 synchronize by Steelpoint
November 24, 2024 14:08 13s
November 24, 2024 14:08 13s
Upp status tacmap Check for merge conflicts #29529: Pull request #7672 opened by cuberound
November 24, 2024 13:41 10s
November 24, 2024 13:41 10s
Adds shove prefereance to the king Check for merge conflicts #29528: Pull request #7671 opened by Red-byte3D
November 24, 2024 13:31 12s
November 24, 2024 13:31 12s
Flexible Job Icons Check for merge conflicts #29527: Pull request #7106 synchronize by realforest2001
November 24, 2024 12:51 4m 9s
November 24, 2024 12:51 4m 9s
Remote Monitoring Cameras Check for merge conflicts #29526: Pull request #7296 synchronize by realforest2001
November 24, 2024 12:48 1m 26s
November 24, 2024 12:48 1m 26s
Fax Responders - late spawn faxes Check for merge conflicts #29525: Pull request #7670 opened by realforest2001
November 24, 2024 12:46 3m 54s
November 24, 2024 12:46 3m 54s
Fax Responders TestMerge Collection Check for merge conflicts #29524: Pull request #7165 synchronize by realforest2001
November 24, 2024 12:45 1m 1s
November 24, 2024 12:45 1m 1s
Adds ASO to Command Timelocks, and CO to MP timelocks. Check for merge conflicts #29523: Pull request #7666 synchronize by realforest2001
November 24, 2024 12:30 1m 0s
November 24, 2024 12:30 1m 0s
Adds ability for admins to end round with a custom ending + upp ending icon Check for merge conflicts #29522: Pull request #7548 synchronize by Blundir
November 24, 2024 11:19 12s
November 24, 2024 11:19 12s
Adds ability for admins to end round with a custom ending + upp ending icon Check for merge conflicts #29521: Pull request #7548 synchronize by Blundir
November 24, 2024 10:02 12s
November 24, 2024 10:02 12s
Missing icons unit test expansion Check for merge conflicts #29520: Pull request #7659 synchronize by Drulikar
November 24, 2024 07:38 59s
November 24, 2024 07:38 59s
Missing icons unit test expansion Check for merge conflicts #29519: Pull request #7659 ready_for_review by Drulikar
November 24, 2024 07:35 1m 50s
November 24, 2024 07:35 1m 50s
Some changes to broadcasting Check for merge conflicts #29518: Pull request #7662 synchronize by ihatethisengine
November 24, 2024 07:34 12s
November 24, 2024 07:34 12s
Missing icons unit test expansion Check for merge conflicts #29517: Pull request #7659 synchronize by Drulikar
November 24, 2024 07:27 1m 2s
November 24, 2024 07:27 1m 2s
Missing icons unit test expansion Check for merge conflicts #29516: Pull request #7659 synchronize by Drulikar
November 24, 2024 07:13 11s
November 24, 2024 07:13 11s
Missing icons unit test expansion Check for merge conflicts #29515: Pull request #7659 synchronize by Drulikar
November 24, 2024 06:47 59s
November 24, 2024 06:47 59s
HvH: remote flight control respects factions Check for merge conflicts #29514: Pull request #7669 opened by ihatethisengine
November 24, 2024 06:43 15s
November 24, 2024 06:43 15s
Missing icons unit test expansion Check for merge conflicts #29513: Pull request #7659 synchronize by Drulikar
November 24, 2024 06:27 1m 3s
November 24, 2024 06:27 1m 3s