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,293 workflow run results
4,293 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

L'évacuation - 1 Check for merge conflicts #17005: Pull request #5052 synchronize by LC4492
November 29, 2023 23:29 1m 0s
November 29, 2023 23:29 1m 0s
Project ARES: Admin Console Check for merge conflicts #17004: Pull request #4182 synchronize by realforest2001
November 29, 2023 23:22 18s
November 29, 2023 23:22 18s
Project ARES: Added Tech Unlock logs Check for merge conflicts #17003: Pull request #5006 synchronize by realforest2001
November 29, 2023 23:21 16s
November 29, 2023 23:21 16s
Project ARES TM Holder (v4) Check for merge conflicts #17002: Pull request #5007 synchronize by realforest2001
November 29, 2023 22:56 14s
November 29, 2023 22:56 14s
added a file to handle the fridges in kitchen on almayer and added a … Check for merge conflicts #17001: Commit 3f79ad3 pushed by github-merge-queue bot
November 29, 2023 22:24 4m 26s master
master
November 29, 2023 22:24 4m 26s
Functional M5 Gasmask Check for merge conflicts #17000: Pull request #5072 synchronize by Ediblebomb
November 29, 2023 22:11 10s
November 29, 2023 22:11 10s
Functional M5 Gasmask Check for merge conflicts #16999: Pull request #5072 opened by Ediblebomb
November 29, 2023 22:02 11s
November 29, 2023 22:02 11s
fixes orbit menu for 0 health and admins refreshing (#5032) Check for merge conflicts #16998: Commit ddc6c67 pushed by github-merge-queue bot
November 29, 2023 21:59 4m 19s master
master
November 29, 2023 21:59 4m 19s
Gives Synthetic Survivor Overwatch Training Check for merge conflicts #16997: Pull request #5070 synchronize by Foxtrot13224
November 29, 2023 21:37 10s
November 29, 2023 21:37 10s
Refactors Xenomorph initialize (#4991) Check for merge conflicts #16996: Commit c86715c pushed by github-merge-queue bot
November 29, 2023 21:30 4m 20s master
master
November 29, 2023 21:30 4m 20s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16995: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 21:15 10s
November 29, 2023 21:15 10s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16994: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 21:11 14s
November 29, 2023 21:11 14s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16993: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 21:04 17s
November 29, 2023 21:04 17s
GAU Buff - Shooting twice the bullet per bullet Check for merge conflicts #16992: Pull request #5065 synchronize by blackdragonTOW
November 29, 2023 20:46 21s
November 29, 2023 20:46 21s
Gives Synthetic Survivor Overwatch Training Check for merge conflicts #16991: Pull request #5070 opened by Foxtrot13224
November 29, 2023 20:43 11s
November 29, 2023 20:43 11s
added a file to handle the fridges in kitchen on almayer and added a bunch of food boxes. Check for merge conflicts #16990: Pull request #4586 synchronize by Huffie56
November 29, 2023 20:35 10s
November 29, 2023 20:35 10s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16989: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 20:33 14s
November 29, 2023 20:33 14s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16988: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 20:15 27s
November 29, 2023 20:15 27s
[s] Return Ice Classic to CM for the Holiday Season Check for merge conflicts #16987: Pull request #5067 synchronize by BeagleGaming1
November 29, 2023 20:15 11s
November 29, 2023 20:15 11s
Keycard authenticator can call ERT winout admin intervention Check for merge conflicts #16986: Pull request #4477 synchronize by harryob
November 29, 2023 20:10 15s
November 29, 2023 20:10 15s
Updates santa hats Check for merge conflicts #16985: Pull request #5069 synchronize by BeagleGaming1
November 29, 2023 19:47 10s
November 29, 2023 19:47 10s
Updates santa hats Check for merge conflicts #16984: Pull request #5069 synchronize by BeagleGaming1
November 29, 2023 19:34 16s
November 29, 2023 19:34 16s
Updates santa hats Check for merge conflicts #16983: Pull request #5069 opened by BeagleGaming1
November 29, 2023 19:32 16s
November 29, 2023 19:32 16s
L'évacuation - 1 Check for merge conflicts #16982: Pull request #5052 synchronize by LC4492
November 29, 2023 18:50 11s
November 29, 2023 18:50 11s
Gau rework this time for real ;) Check for merge conflicts #16981: Pull request #5068 synchronize by cuberound
November 29, 2023 18:41 11s
November 29, 2023 18:41 11s