Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,631 workflow run results
2,631 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

UPP Survivors Use Player Names + Radio Change (#4461) Check for merge conflicts #14798: Commit c647d22 pushed by github-merge-queue bot
September 26, 2023 18:12 2m 16s master
master
September 26, 2023 18:12 2m 16s
Disease protection Check for merge conflicts #14797: Pull request #4524 opened by kiVts
September 26, 2023 18:05 1m 11s
September 26, 2023 18:05 1m 11s
Vulture tweaks (#4456) Check for merge conflicts #14796: Commit b6e5794 pushed by github-merge-queue bot
September 26, 2023 17:58 4m 17s master
master
September 26, 2023 17:58 4m 17s
Vulture tweaks Check for merge conflicts #14795: Pull request #4456 ready_for_review by morrowwolf
September 26, 2023 17:50 17s
September 26, 2023 17:50 17s
Auto observer fixes, preferences, and QoL (#4463) Check for merge conflicts #14794: Commit 7be68a9 pushed by github-merge-queue bot
September 26, 2023 17:07 4m 20s master
master
September 26, 2023 17:07 4m 20s
Vulture tweaks Check for merge conflicts #14793: Pull request #4456 synchronize by Zonespace27
September 26, 2023 16:49 19s
September 26, 2023 16:49 19s
New CIC uniform (#4320) Check for merge conflicts #14792: Commit 513f645 pushed by github-merge-queue bot
September 26, 2023 16:45 4m 19s master
master
September 26, 2023 16:45 4m 19s
Vulture tweaks Check for merge conflicts #14791: Pull request #4456 synchronize by Zonespace27
September 26, 2023 16:30 12s
September 26, 2023 16:30 12s
refactor : divide survivor preset base on maps. Check for merge conflicts #14790: Pull request #4522 ready_for_review by Huffie56
September 26, 2023 16:26 1m 36s
September 26, 2023 16:26 1m 36s
refactor : divide survivor preset base on maps. Check for merge conflicts #14789: Pull request #4522 synchronize by Huffie56
September 26, 2023 15:31 30s
September 26, 2023 15:31 30s
refactor : divide survivor preset base on maps. Check for merge conflicts #14788: Pull request #4522 synchronize by Huffie56
September 26, 2023 15:25 47s
September 26, 2023 15:25 47s
TGUI: Microwave Check for merge conflicts #14787: Pull request #4523 opened by Crowbar764
September 26, 2023 15:23 12s
September 26, 2023 15:23 12s
refactor : divide survivor preset base on maps. Check for merge conflicts #14786: Pull request #4522 synchronize by Huffie56
September 26, 2023 15:02 12s
September 26, 2023 15:02 12s
ert tweaks Check for merge conflicts #14785: Pull request #4484 synchronize by CapCamIII
September 26, 2023 14:51 13s
September 26, 2023 14:51 13s
UPP rank Check for merge conflicts #14784: Pull request #4380 ready_for_review by CapCamIII
September 26, 2023 14:47 11s
September 26, 2023 14:47 11s
UPP rank Check for merge conflicts #14783: Pull request #4380 synchronize by CapCamIII
September 26, 2023 14:41 13s
September 26, 2023 14:41 13s
refactor : divide survivor preset base on maps. Check for merge conflicts #14782: Pull request #4522 opened by Huffie56
September 26, 2023 14:24 12s
September 26, 2023 14:24 12s
Map fix Check for merge conflicts #14781: Pull request #4521 opened by Wyderar
September 26, 2023 14:13 13s
September 26, 2023 14:13 13s
Adds Sensor Towers To All Maps (V2) Check for merge conflicts #14780: Pull request #4520 opened by Steelpoint
September 26, 2023 14:09 17s
September 26, 2023 14:09 17s
Minor Item Additions To Synth Vendor Check for merge conflicts #14779: Pull request #4515 synchronize by Steelpoint
September 26, 2023 14:00 21s
September 26, 2023 14:00 21s
Хуйня Check for merge conflicts #14778: Pull request #4519 opened by Wyderar
September 26, 2023 13:54 15s
September 26, 2023 13:54 15s
Minor Item Additions To Synth Vendor Check for merge conflicts #14777: Pull request #4515 ready_for_review by Steelpoint
September 26, 2023 13:45 20s
September 26, 2023 13:45 20s
Minor Item Additions To Synth Vendor Check for merge conflicts #14776: Pull request #4515 synchronize by Steelpoint
September 26, 2023 13:43 11s
September 26, 2023 13:43 11s
Makes Pylon Alert Message Better Stress Its Danger To Marines Check for merge conflicts #14775: Pull request #4518 opened by Steelpoint
September 26, 2023 13:31 13s
September 26, 2023 13:31 13s
makes LZ detector work while landed Check for merge conflicts #14774: Pull request #4516 synchronize by cuberound
September 26, 2023 13:23 11s
September 26, 2023 13:23 11s