Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
7,892 workflow run results
7,892 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

LV624 Comm Tower Mapping Changes Check for merge conflicts #19029: Pull request #5560 opened by Steelpoint
January 26, 2024 04:55 10s
January 26, 2024 04:55 10s
UPP ERT Backstory Change Check for merge conflicts #19028: Pull request #5559 synchronize by CyberSpyXD
January 26, 2024 04:50 10s
January 26, 2024 04:50 10s
UPP ERT Backstory Change Check for merge conflicts #19027: Pull request #5559 synchronize by CyberSpyXD
January 26, 2024 04:48 9s
January 26, 2024 04:48 9s
UPP ERT Backstory Change Check for merge conflicts #19026: Pull request #5559 opened by CyberSpyXD
January 26, 2024 04:47 11s
January 26, 2024 04:47 11s
Fixes a bunch of spelling mistakes Check for merge conflicts #19025: Pull request #5555 synchronize by Contrabang
January 26, 2024 03:50 13s
January 26, 2024 03:50 13s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19024: Pull request #5458 synchronize by LC4492
January 26, 2024 01:42 13s
January 26, 2024 01:42 13s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19023: Pull request #5458 synchronize by LC4492
January 26, 2024 01:41 12s
January 26, 2024 01:41 12s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19022: Pull request #5458 synchronize by LC4492
January 26, 2024 01:40 10s
January 26, 2024 01:40 10s
Fixes a bunch of spelling mistakes Check for merge conflicts #19021: Pull request #5555 opened by Contrabang
January 26, 2024 01:32 12s
January 26, 2024 01:32 12s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19020: Pull request #5458 synchronize by LC4492
January 26, 2024 01:31 13s
January 26, 2024 01:31 13s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19019: Pull request #5458 synchronize by LC4492
January 26, 2024 01:12 25s
January 26, 2024 01:12 25s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19018: Pull request #5458 synchronize by LC4492
January 26, 2024 01:10 2m 13s
January 26, 2024 01:10 2m 13s
Réorganisation de l'équipe médicale - 1 Check for merge conflicts #19017: Pull request #5458 synchronize by LC4492
January 26, 2024 01:05 15s
January 26, 2024 01:05 15s
Deadchat no longer gets notified about tutorial facehuggers Check for merge conflicts #19016: Pull request #5546 ready_for_review by Contrabang
January 26, 2024 00:51 11s
January 26, 2024 00:51 11s
Deadchat no longer gets notified about tutorial facehuggers Check for merge conflicts #19015: Pull request #5546 synchronize by Contrabang
January 26, 2024 00:45 15s
January 26, 2024 00:45 15s
Requisition Centralization [Part 1] (#5490) Check for merge conflicts #19014: Commit b173347 pushed by github-merge-queue bot
January 26, 2024 00:09 4m 16s master
master
January 26, 2024 00:09 4m 16s
Research Fire Properties rework/rebalance Check for merge conflicts #19013: Pull request #5519 synchronize by iloveloopers
January 26, 2024 00:06 8s
January 26, 2024 00:06 8s
adds warning messages when CAS sonic boom happens and makes the boom … Check for merge conflicts #19012: Commit 9cb7ac7 pushed by github-merge-queue bot
January 25, 2024 23:56 4m 14s master
master
January 25, 2024 23:56 4m 14s
Fix latejoin menu marine title (#5537) Check for merge conflicts #19011: Commit 4522944 pushed by github-merge-queue bot
January 25, 2024 23:43 4m 19s master
master
January 25, 2024 23:43 4m 19s
fix and small refactor of Areas in lower deck on almayer part2 (#5373) Check for merge conflicts #19010: Commit 86d6ca6 pushed by github-merge-queue bot
January 25, 2024 23:25 4m 18s master
master
January 25, 2024 23:25 4m 18s
MP QoL : part 1 Check for merge conflicts #19009: Pull request #5554 opened by Diegoflores31
January 25, 2024 23:23 10s
January 25, 2024 23:23 10s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19008: Pull request #5553 ready_for_review by Huffie56
January 25, 2024 23:09 15s
January 25, 2024 23:09 15s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19007: Pull request #5553 synchronize by harryob
January 25, 2024 22:39 14s
January 25, 2024 22:39 14s
updates the opendream script with the correct packaged location Check for merge conflicts #19006: Commit a56a633 pushed by harryob
January 25, 2024 22:39 2m 12s master
master
January 25, 2024 22:39 2m 12s
refactor : turn some "# and use the proper define from colour.dm for 21 files. Check for merge conflicts #19005: Pull request #5553 synchronize by harryob
January 25, 2024 22:33 1m 26s
January 25, 2024 22:33 1m 26s