Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,334 workflow run results
4,334 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds Latejoin scaling to Vendors and ASRS Check for merge conflicts #16505: Pull request #4939 synchronize by fira
November 16, 2023 23:15 13s
November 16, 2023 23:15 13s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16504: Pull request #4940 synchronize by harryob
November 16, 2023 22:46 17s
November 16, 2023 22:46 17s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16503: Pull request #4940 synchronize by harryob
November 16, 2023 22:46 13s
November 16, 2023 22:46 13s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16502: Pull request #4940 synchronize by harryob
November 16, 2023 22:45 13s
November 16, 2023 22:45 13s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16501: Pull request #4940 synchronize by harryob
November 16, 2023 22:39 2m 25s
November 16, 2023 22:39 2m 25s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16500: Pull request #4940 synchronize by harryob
November 16, 2023 22:39 1m 54s
November 16, 2023 22:39 1m 54s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16499: Pull request #4940 synchronize by harryob
November 16, 2023 22:39 1m 25s
November 16, 2023 22:39 1m 25s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16498: Pull request #4940 synchronize by harryob
November 16, 2023 22:39 36s
November 16, 2023 22:39 36s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16497: Pull request #4940 synchronize by harryob
November 16, 2023 22:38 16s
November 16, 2023 22:38 16s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16496: Pull request #4940 synchronize by harryob
November 16, 2023 22:38 12s
November 16, 2023 22:38 12s
Dropship weapons console TGUI Check for merge conflicts #16495: Pull request #4812 synchronize by mullenpaul
November 16, 2023 22:37 9s
November 16, 2023 22:37 9s
Refactors vendor global scope procs (#4918) Check for merge conflicts #16494: Commit b7dbcf9 pushed by github-merge-queue bot
November 16, 2023 22:27 4m 14s master
master
November 16, 2023 22:27 4m 14s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16493: Pull request #4941 synchronize by Birdtalon
November 16, 2023 22:23 10s
November 16, 2023 22:23 10s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16492: Pull request #4941 synchronize by Birdtalon
November 16, 2023 22:03 14s
November 16, 2023 22:03 14s
Refactors vendor global scope procs Check for merge conflicts #16491: Pull request #4918 synchronize by Birdtalon
November 16, 2023 21:56 16s
November 16, 2023 21:56 16s
Starts refactoring Xenomorph.dm and other xenocode. Check for merge conflicts #16490: Pull request #4941 opened by Birdtalon
November 16, 2023 21:50 1m 8s
November 16, 2023 21:50 1m 8s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16489: Pull request #4940 synchronize by harryob
November 16, 2023 21:49 10s
November 16, 2023 21:49 10s
check_grep.sh part ??: adds all global vars to the global controller Check for merge conflicts #16488: Pull request #4940 synchronize by harryob
November 16, 2023 21:48 13s
November 16, 2023 21:48 13s
Ravager: replaces single letter vars (#4928) Check for merge conflicts #16487: Commit b04af9a pushed by github-merge-queue bot
November 16, 2023 21:42 4m 17s master
master
November 16, 2023 21:42 4m 17s
Adds Reflection to VV Modify Transform (#4907) Check for merge conflicts #16486: Commit 44f6a75 pushed by github-merge-queue bot
November 16, 2023 21:25 4m 21s master
master
November 16, 2023 21:25 4m 21s
Refactors vendor global scope procs Check for merge conflicts #16485: Pull request #4918 ready_for_review by Birdtalon
November 16, 2023 21:15 2m 49s
November 16, 2023 21:15 2m 49s
Refactors vendor global scope procs Check for merge conflicts #16484: Pull request #4918 synchronize by Birdtalon
November 16, 2023 21:15 2m 14s
November 16, 2023 21:15 2m 14s
Vehicles can be followed by ghosts (#4904) Check for merge conflicts #16483: Commit 5d8f695 pushed by github-merge-queue bot
November 16, 2023 21:11 4m 18s master
master
November 16, 2023 21:11 4m 18s
Biosuit Toe Fix (#4920) Check for merge conflicts #16482: Commit a83dcc9 pushed by github-merge-queue bot
November 16, 2023 20:34 4m 16s master
master
November 16, 2023 20:34 4m 16s
Lurker: bug fix, var disambiguation and redundant type checks (#4922) Check for merge conflicts #16481: Commit 75bdfdb pushed by github-merge-queue bot
November 16, 2023 20:20 4m 23s master
master
November 16, 2023 20:20 4m 23s