Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
16,540 workflow runs
16,540 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Post dmi reorg fixes Check for merge conflicts #30532: Pull request #7782 synchronize by Blundir
December 14, 2024 01:52 8s
December 14, 2024 01:52 8s
Fixes the NailGun Again Check for merge conflicts #30531: Pull request #7815 synchronize by Lukas-Seltz
December 14, 2024 01:42 4m 18s
December 14, 2024 01:42 4m 18s
adds some missing save preference calls (#7793) Check for merge conflicts #30530: Commit 8ede75a pushed by github-merge-queue bot
December 14, 2024 00:47 6m 13s master
master
December 14, 2024 00:47 6m 13s
New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Check for merge conflicts #30529: Pull request #6951 synchronize by LC4492
December 13, 2024 23:13 1m 31s
December 13, 2024 23:13 1m 31s
New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Check for merge conflicts #30528: Pull request #6951 synchronize by LC4492
December 13, 2024 23:04 10s
December 13, 2024 23:04 10s
New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Check for merge conflicts #30527: Pull request #6951 synchronize by LC4492
December 13, 2024 22:44 4m 50s
December 13, 2024 22:44 4m 50s
Paperwork Prefabs Check for merge conflicts #30526: Pull request #5265 synchronize by realforest2001
December 13, 2024 22:19 12s
December 13, 2024 22:19 12s
Fax Responders TestMerge Collection Check for merge conflicts #30525: Pull request #7165 synchronize by realforest2001
December 13, 2024 22:19 11s
December 13, 2024 22:19 11s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #30524: Pull request #6248 ready_for_review by Drulikar
December 13, 2024 21:45 11s
December 13, 2024 21:45 11s
Post dmi reorg fixes Check for merge conflicts #30523: Pull request #7782 synchronize by Blundir
December 13, 2024 21:19 9s
December 13, 2024 21:19 9s
Post dmi reorg fixes Check for merge conflicts #30522: Pull request #7782 synchronize by Blundir
December 13, 2024 21:13 9s
December 13, 2024 21:13 9s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #30521: Pull request #6248 synchronize by Zenith00000
December 13, 2024 21:10 10s
December 13, 2024 21:10 10s
New Map: LV-759 Hybrisa Prospera Check for merge conflicts #30520: Pull request #6248 synchronize by Zenith00000
December 13, 2024 19:25 6m 56s
December 13, 2024 19:25 6m 56s
Paperwork Prefabs Check for merge conflicts #30519: Pull request #5265 synchronize by realforest2001
December 13, 2024 19:21 10m 16s
December 13, 2024 19:21 10m 16s
Fixes the NailGun Again Check for merge conflicts #30518: Pull request #7815 synchronize by Lukas-Seltz
December 13, 2024 19:17 10m 28s
December 13, 2024 19:17 10m 28s
Fixes the NailGun Again Check for merge conflicts #30517: Pull request #7815 opened by Lukas-Seltz
December 13, 2024 19:16 10m 46s
December 13, 2024 19:16 10m 46s
Fax Responders TestMerge Collection Check for merge conflicts #30516: Pull request #7165 synchronize by realforest2001
December 13, 2024 19:08 11m 45s
December 13, 2024 19:08 11m 45s
Remote Monitoring Cameras Check for merge conflicts #30515: Pull request #7296 synchronize by realforest2001
December 13, 2024 19:05 1m 58s
December 13, 2024 19:05 1m 58s
Paperwork Prefabs Check for merge conflicts #30514: Pull request #5265 synchronize by realforest2001
December 13, 2024 19:04 1m 33s
December 13, 2024 19:04 1m 33s
Paperwork Prefabs Check for merge conflicts #30513: Pull request #5265 ready_for_review by realforest2001
December 13, 2024 19:04 1m 28s
December 13, 2024 19:04 1m 28s
vaiso and chem retrieval erts can now use their shuttles (#7735) Check for merge conflicts #30512: Commit 2acdd9a pushed by github-merge-queue bot
December 13, 2024 18:57 6m 16s master
master
December 13, 2024 18:57 6m 16s
allows synthetics to paint their faces with facepaint Check for merge conflicts #30511: Pull request #7814 opened by AndroBetel
December 13, 2024 18:42 12s
December 13, 2024 18:42 12s
reduce the amount of times you have to fix chat Check for merge conflicts #30510: Pull request #7813 opened by harryob
December 13, 2024 18:42 13s
December 13, 2024 18:42 13s
Post dmi reorg fixes Check for merge conflicts #30509: Pull request #7782 synchronize by Blundir
December 13, 2024 17:21 19s
December 13, 2024 17:21 19s
New "in_hands" and "onmob" icon sprites for objects, book import from PVE (thanks Amory), small changes and fixes Check for merge conflicts #30508: Pull request #6951 synchronize by LC4492
December 13, 2024 16:41 11s
December 13, 2024 16:41 11s