Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,297 workflow run results
1,297 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

notify ghosts Check for merge conflicts #13815: Pull request #4241 synchronize by harryob
August 24, 2023 06:48 14s
August 24, 2023 06:48 14s
Move xeno grab cooldown change to just ctrl+click logic Check for merge conflicts #13814: Pull request #4246 opened by Drulikar
August 24, 2023 05:03 12s
August 24, 2023 05:03 12s
Biolock & Tristan Donor Gear Check for merge conflicts #13813: Pull request #4245 synchronize by Warfan1815
August 24, 2023 03:14 14s
August 24, 2023 03:14 14s
Crashed UPP Survivors Insert Tweaks Check for merge conflicts #13812: Pull request #4123 synchronize by Steelpoint
August 24, 2023 02:46 11s
August 24, 2023 02:46 11s
Royal Marines Commando Check for merge conflicts #13811: Pull request #4098 synchronize by spartanbobby
August 24, 2023 02:17 13s
August 24, 2023 02:17 13s
Biolock & Tristan Donor Gear Check for merge conflicts #13810: Pull request #4245 opened by Warfan1815
August 24, 2023 02:16 2m 14s
August 24, 2023 02:16 2m 14s
Overwatch Console TGUI Refactor Check for merge conflicts #13809: Pull request #4178 synchronize by TheGamerdk
August 23, 2023 22:53 3m 14s
August 23, 2023 22:53 3m 14s
Overwatch Console TGUI Refactor Check for merge conflicts #13808: Pull request #4178 synchronize by TheGamerdk
August 23, 2023 22:50 29s
August 23, 2023 22:50 29s
notify ghosts Check for merge conflicts #13807: Pull request #4241 synchronize by harryob
August 23, 2023 22:49 15s
August 23, 2023 22:49 15s
notify ghosts Check for merge conflicts #13806: Pull request #4241 opened by harryob
August 23, 2023 22:48 13s
August 23, 2023 22:48 13s
M4RA damage buff (#4233) Check for merge conflicts #13805: Commit 2b6f5fe pushed by github-merge-queue bot
August 23, 2023 20:55 4m 16s master
master
August 23, 2023 20:55 4m 16s
ASO/QM Database access (#4230) Check for merge conflicts #13804: Commit c8acbd4 pushed by github-merge-queue bot
August 23, 2023 20:13 4m 15s master
master
August 23, 2023 20:13 4m 15s
NV fixes Check for merge conflicts #13803: Pull request #4240 opened by AnuvKH
August 23, 2023 20:08 12s
August 23, 2023 20:08 12s
Possible fix for binoc perma zoom (#4176) Check for merge conflicts #13802: Commit d260ac0 pushed by github-merge-queue bot
August 23, 2023 19:59 4m 16s master
master
August 23, 2023 19:59 4m 16s
fancy lighting Check for merge conflicts #13801: Pull request #4229 synchronize by harryob
August 23, 2023 19:43 11s
August 23, 2023 19:43 11s
fancy lighting Check for merge conflicts #13800: Pull request #4229 synchronize by harryob
August 23, 2023 19:13 11s
August 23, 2023 19:13 11s
fancy lighting Check for merge conflicts #13799: Pull request #4229 synchronize by harryob
August 23, 2023 19:10 15s
August 23, 2023 19:10 15s
Brings automatic weaponry to the marine and surv arsenal (#4003) Check for merge conflicts #13798: Commit 295ef51 pushed by github-merge-queue bot
August 23, 2023 18:42 4m 14s master
master
August 23, 2023 18:42 4m 14s
Fix wire cutter on a plant bug Check for merge conflicts #13797: Pull request #4239 opened by MikeKuwait
August 23, 2023 18:07 15s
August 23, 2023 18:07 15s
fancy lighting Check for merge conflicts #13796: Pull request #4229 synchronize by harryob
August 23, 2023 17:44 11s
August 23, 2023 17:44 11s
fancy lighting Check for merge conflicts #13795: Pull request #4229 synchronize by harryob
August 23, 2023 17:37 13s
August 23, 2023 17:37 13s
fancy lighting Check for merge conflicts #13794: Pull request #4229 synchronize by harryob
August 23, 2023 16:51 29s
August 23, 2023 16:51 29s
Dropship turf direction sprites Check for merge conflicts #13793: Pull request #3642 synchronize by mullenpaul
August 23, 2023 16:50 15s
August 23, 2023 16:50 15s
New facehugger strain: Watcher Check for merge conflicts #13792: Pull request #3726 reopened by Huffie56
August 23, 2023 16:25 13s
August 23, 2023 16:25 13s
refactor : clean dmi file extract spritten hiden inside other sprites direction. removing sprite change from dmm files. Check for merge conflicts #13791: Pull request #4232 synchronize by Huffie56
August 23, 2023 13:11 15s
August 23, 2023 13:11 15s