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
571 workflow run results
571 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

kills dropship timelock Check for merge conflicts #96: Commit 17eaa08 pushed by morrowwolf
October 21, 2023 07:36 9s master
master
October 21, 2023 07:36 9s
No xeno evolving Check for merge conflicts #95: Commit e3ae9e9 pushed by morrowwolf
October 21, 2023 07:32 13s master
master
October 21, 2023 07:32 13s
correct hardcore flag Check for merge conflicts #94: Commit 5790204 pushed by morrowwolf
October 21, 2023 07:23 10s master
master
October 21, 2023 07:23 10s
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 Check for merge conflicts #93: Commit dff973b pushed by morrowwolf
October 21, 2023 07:14 13s master
master
October 21, 2023 07:14 13s
makes tests run on pushes to master (#14) Check for merge conflicts #92: Commit 67d386d pushed by morrowwolf
October 21, 2023 06:49 13s master
master
October 21, 2023 06:49 13s
makes tests run on pushes to master Check for merge conflicts #91: Pull request #14 opened by harryob
October 21, 2023 06:40 15s
October 21, 2023 06:40 15s
properly cleans up the ai movement handler (#13) Check for merge conflicts #90: Commit 07134a5 pushed by morrowwolf
October 21, 2023 06:12 13s master
master
October 21, 2023 06:12 13s
properly cleans up the ai movement handler Check for merge conflicts #89: Pull request #13 opened by harryob
October 21, 2023 06:03 2m 14s
October 21, 2023 06:03 2m 14s
properly deletes the ai movement handler Check for merge conflicts #88: Pull request #12 opened by harryob
October 21, 2023 05:50 11s
October 21, 2023 05:50 11s
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 Check for merge conflicts #87: Commit c9374fa pushed by morrowwolf
October 21, 2023 00:38 11s master
master
October 21, 2023 00:38 11s
Megaphone patch (#11) Check for merge conflicts #86: Commit 4a141af pushed by morrowwolf
October 21, 2023 00:16 2m 41s master
master
October 21, 2023 00:16 2m 41s
Megaphone patch Check for merge conflicts #85: Pull request #11 opened by morrowwolf
October 21, 2023 00:15 17s
October 21, 2023 00:15 17s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #84: Commit 1bd677b pushed by morrowwolf
October 20, 2023 22:14 14s master
master
October 20, 2023 22:14 14s
Made xeno count input better Check for merge conflicts #83: Commit 63e0517 pushed by morrowwolf
October 20, 2023 22:11 12s master
master
October 20, 2023 22:11 12s
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13 Check for merge conflicts #82: Commit 029d28f pushed by morrowwolf
October 20, 2023 21:38 12s master
master
October 20, 2023 21:38 12s
Autodoc rebuff, wrong modes no longer voteable, shotgun special ammo … Check for merge conflicts #81: Commit c6289ff pushed by morrowwolf
October 20, 2023 19:47 2m 16s master
master
October 20, 2023 19:47 2m 16s
Autodoc rebuff, wrong modes no longer voteable, shotgun special ammo sound buff, SO novice surgery Check for merge conflicts #80: Pull request #10 synchronize by morrowwolf
October 20, 2023 19:47 11s
October 20, 2023 19:47 11s
Autodoc rebuff, wrong modes no longer voteable, shotgun special ammo sound buff, SO novice surgery Check for merge conflicts #79: Pull request #10 synchronize by xDanilcusx
October 20, 2023 18:54 14s
October 20, 2023 18:54 14s
Autodoc rebuff, wrong modes no longer voteable, shotgun special ammo sound buff, SO novice surgery Check for merge conflicts #78: Pull request #10 opened by xDanilcusx
October 20, 2023 02:57 16s
October 20, 2023 02:57 16s
MD, sentries Check for merge conflicts #77: Commit 87fc676 pushed by morrowwolf
October 20, 2023 01:28 15s master
master
October 20, 2023 01:28 15s
10 million squad changes Check for merge conflicts #76: Commit a3728f4 pushed by morrowwolf
October 20, 2023 00:53 16s master
master
October 20, 2023 00:53 16s
tacmap for pltco Check for merge conflicts #75: Commit c43ddbb pushed by morrowwolf
October 19, 2023 23:47 15s master
master
October 19, 2023 23:47 15s
dorm lights Check for merge conflicts #74: Commit 3f5e5d0 pushed by morrowwolf
October 19, 2023 21:29 15s master
master
October 19, 2023 21:29 15s
upstream fixes Check for merge conflicts #73: Commit 9d65680 pushed by morrowwolf
October 19, 2023 20:44 16s master
master
October 19, 2023 20:44 16s
Merge remote-tracking branch 'CMSS13/master' Check for merge conflicts #72: Commit 64b11c9 pushed by morrowwolf
October 19, 2023 20:38 14s master
master
October 19, 2023 20:38 14s
ProTip! You can narrow down the results and go further in time using created:<2023-10-19 or the other filters available.