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,883 workflow run results
2,883 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14850: Pull request #4531 synchronize by Warfan1815
September 27, 2023 19:02 20s
September 27, 2023 19:02 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14849: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:52 8m 20s
September 27, 2023 18:52 8m 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14848: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:52 5m 57s
September 27, 2023 18:52 5m 57s
Disallows taking control of crit xenos (#4517) Check for merge conflicts #14847: Commit f21e167 pushed by github-merge-queue bot
September 27, 2023 18:52 7m 57s master
master
September 27, 2023 18:52 7m 57s
Adds drawing to tacmaps Check for merge conflicts #14846: Pull request #4475 synchronize by ghost
September 27, 2023 18:44 3m 26s
September 27, 2023 18:44 3m 26s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14845: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:42 3m 59s
September 27, 2023 18:42 3m 59s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14844: Pull request #4531 synchronize by Warfan1815
September 27, 2023 18:42 4m 28s
September 27, 2023 18:42 4m 28s
Makes Pylon Alert Message Better Stress Its Danger To Marines (#4518) Check for merge conflicts #14843: Commit 573ced1 pushed by github-merge-queue bot
September 27, 2023 18:36 4m 20s master
master
September 27, 2023 18:36 4m 20s
Optional Squad Briefing Rooms: Or, why I learnt to stop req queuing and love the squad Check for merge conflicts #14842: Pull request #4531 opened by Warfan1815
September 27, 2023 18:24 13s
September 27, 2023 18:24 13s
Disease protection Check for merge conflicts #14841: Pull request #4524 synchronize by kiVts
September 27, 2023 16:10 12s
September 27, 2023 16:10 12s
refactor : divide survivor preset base on maps. Check for merge conflicts #14840: Pull request #4522 synchronize by Huffie56
September 27, 2023 11:57 16s
September 27, 2023 11:57 16s
TGUI: Microwave Check for merge conflicts #14839: Pull request #4523 ready_for_review by Crowbar764
September 27, 2023 10:04 12s
September 27, 2023 10:04 12s
refactor : divide survivor preset base on maps. Check for merge conflicts #14838: Pull request #4522 ready_for_review by Huffie56
September 27, 2023 09:56 43s
September 27, 2023 09:56 43s
TGUI: Microwave Check for merge conflicts #14837: Pull request #4523 synchronize by Crowbar764
September 27, 2023 09:54 2m 26s
September 27, 2023 09:54 2m 26s
TGUI: Microwave Check for merge conflicts #14836: Pull request #4523 synchronize by Crowbar764
September 27, 2023 09:53 15s
September 27, 2023 09:53 15s
refactor : divide survivor preset base on maps. Check for merge conflicts #14835: Pull request #4522 synchronize by Huffie56
September 27, 2023 09:48 17s
September 27, 2023 09:48 17s
refactor : divide survivor preset base on maps. Check for merge conflicts #14834: Pull request #4522 synchronize by Huffie56
September 27, 2023 09:40 13s
September 27, 2023 09:40 13s
Minor Item Additions To Synth Vendor Check for merge conflicts #14833: Pull request #4515 synchronize by Steelpoint
September 27, 2023 08:39 16s
September 27, 2023 08:39 16s
Yautja can no longer mark xenoes as honorable Check for merge conflicts #14832: Pull request #4529 opened by Zonespace27
September 27, 2023 04:28 14s
September 27, 2023 04:28 14s
Fixes yautja bracers getting stuck in-hand Check for merge conflicts #14831: Pull request #4528 opened by Zonespace27
September 27, 2023 04:23 11s
September 27, 2023 04:23 11s
Fixes yautja relay beacon not uncloaking correctly Check for merge conflicts #14830: Pull request #4527 synchronize by Zonespace27
September 27, 2023 04:03 31s
September 27, 2023 04:03 31s
Fixes yautja relay beacon not uncloaking correctly Check for merge conflicts #14829: Pull request #4527 opened by Zonespace27
September 27, 2023 04:02 12s
September 27, 2023 04:02 12s
Adds drawing to tacmaps Check for merge conflicts #14828: Pull request #4475 synchronize by ghost
September 27, 2023 03:54 13s
September 27, 2023 03:54 13s
Minor Item Additions To Synth Vendor Check for merge conflicts #14827: Pull request #4515 synchronize by Steelpoint
September 27, 2023 02:57 16s
September 27, 2023 02:57 16s
Adds drawing to tacmaps Check for merge conflicts #14826: Pull request #4475 synchronize by ghost
September 27, 2023 01:50 27s
September 27, 2023 01:50 27s
ProTip! You can narrow down the results and go further in time using created:<2023-09-27 or the other filters available.