Skip to content

Actions: cmss13-devs/cmss13-pve

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
587 workflow run results
587 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Brand-new crooshie AI Check for merge conflicts #437: Pull request #51 synchronize by xDanilcusx
November 9, 2023 02:41 13s
November 9, 2023 02:41 13s
Removes xeno tips, a few other things (#52) Check for merge conflicts #436: Commit e6e5b9c pushed by morrowwolf
November 9, 2023 02:29 2m 12s master
master
November 9, 2023 02:29 2m 12s
lock handling Check for merge conflicts #435: Pull request #56 synchronize by morrowwolf
November 9, 2023 02:18 13s
November 9, 2023 02:18 13s
Vehicle autofire Check for merge conflicts #434: Pull request #33 synchronize by Doubleumc
November 9, 2023 02:16 13s
November 9, 2023 02:16 13s
my vision of SG vision Check for merge conflicts #433: Pull request #60 opened by xDanilcusx
November 9, 2023 02:09 10s
November 9, 2023 02:09 10s
Brand-new crooshie AI Check for merge conflicts #432: Pull request #51 synchronize by morrowwolf
November 9, 2023 02:02 13s
November 9, 2023 02:02 13s
Surface icon baking removal Check for merge conflicts #431: Pull request #59 opened by morrowwolf
November 8, 2023 22:54 12s
November 8, 2023 22:54 12s
lock handling Check for merge conflicts #430: Pull request #56 synchronize by harryob
November 8, 2023 22:32 28s
November 8, 2023 22:32 28s
lock handling Check for merge conflicts #429: Pull request #56 synchronize by harryob
November 8, 2023 22:30 13s
November 8, 2023 22:30 13s
Eating takes time, sit to eat is faster Check for merge conflicts #428: Commit de58382 pushed by morrowwolf
November 8, 2023 22:03 2m 14s master
master
November 8, 2023 22:03 2m 14s
Removes cause data from player panel kill Check for merge conflicts #427: Commit 4a3e5e9 pushed by morrowwolf
November 8, 2023 21:43 2m 10s master
master
November 8, 2023 21:43 2m 10s
Once again awkwardly kills squads in game mode Check for merge conflicts #426: Commit f9d0c6a pushed by morrowwolf
November 8, 2023 21:38 2m 15s master
master
November 8, 2023 21:38 2m 15s
lock handling Check for merge conflicts #425: Pull request #56 synchronize by harryob
November 8, 2023 21:08 12s
November 8, 2023 21:08 12s
Should fix pumpkins, PUMPKINS EVERYWHERE Check for merge conflicts #424: Commit 0aa95b1 pushed by morrowwolf
November 8, 2023 20:55 2m 15s master
master
November 8, 2023 20:55 2m 15s
Removes xeno tips, a few other things Check for merge conflicts #423: Pull request #52 ready_for_review by private-tristan
November 8, 2023 19:59 11s
November 8, 2023 19:59 11s
Removes xeno tips, a few other things Check for merge conflicts #422: Pull request #52 synchronize by private-tristan
November 8, 2023 19:59 16s
November 8, 2023 19:59 16s
Removes xeno tips, a few other things Check for merge conflicts #421: Pull request #52 synchronize by private-tristan
November 8, 2023 19:59 13s
November 8, 2023 19:59 13s
Vehicle autofire Check for merge conflicts #420: Pull request #33 synchronize by Doubleumc
November 8, 2023 10:58 11s
November 8, 2023 10:58 11s
Vehicle autofire Check for merge conflicts #419: Pull request #33 synchronize by Doubleumc
November 8, 2023 10:44 12s
November 8, 2023 10:44 12s
lock handling Check for merge conflicts #418: Pull request #56 synchronize by harryob
November 8, 2023 08:52 16s
November 8, 2023 08:52 16s
Lore accurate synthetics Check for merge conflicts #417: Pull request #58 opened by Katskan
November 8, 2023 01:40 11s
November 8, 2023 01:40 11s
Outpost Furidamu Check for merge conflicts #416: Pull request #57 synchronize by morrowwolf
November 7, 2023 23:20 10s
November 7, 2023 23:20 10s
Outpost Furidamu Check for merge conflicts #415: Pull request #57 opened by morrowwolf
November 7, 2023 23:12 12s
November 7, 2023 23:12 12s
New beacon sound! (#50) Check for merge conflicts #414: Commit e0fd655 pushed by morrowwolf
November 7, 2023 20:13 2m 11s master
master
November 7, 2023 20:13 2m 11s
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 Check for merge conflicts #413: Commit cd2a08f pushed by morrowwolf
November 7, 2023 19:58 2m 13s master
master
November 7, 2023 19:58 2m 13s