Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
1,976 workflow run results
1,976 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Adds campfires Check for merge conflicts #13120: Pull request #4091 synchronize by BeagleGaming1
August 3, 2023 21:52 14s
August 3, 2023 21:52 14s
Auxiliary Support Officer Check for merge conflicts #13119: Pull request #4081 synchronize by morrowwolf
August 3, 2023 21:37 1m 2s
August 3, 2023 21:37 1m 2s
Prompt Confirmation before Random Fact Check for merge conflicts #13118: Pull request #4105 synchronize by Ben10083
August 3, 2023 21:35 2m 58s
August 3, 2023 21:35 2m 58s
Prompt Confirmation before Random Fact Check for merge conflicts #13117: Pull request #4105 ready_for_review by Ben10083
August 3, 2023 21:35 2m 59s
August 3, 2023 21:35 2m 59s
Almayer control console tgui (#4066) Check for merge conflicts #13116: Commit 327057e pushed by github-merge-queue bot
August 3, 2023 21:30 4m 15s master
master
August 3, 2023 21:30 4m 15s
Prompt Confirmation before Random Fact Check for merge conflicts #13115: Pull request #4105 opened by Ben10083
August 3, 2023 21:28 11s
August 3, 2023 21:28 11s
Assigned job slots and cryorines. (#4076) Check for merge conflicts #13114: Commit b4859b4 pushed by github-merge-queue bot
August 3, 2023 21:16 4m 18s master
master
August 3, 2023 21:16 4m 18s
Almayer control console tgui Check for merge conflicts #13113: Pull request #4066 synchronize by stanalbatross
August 3, 2023 21:03 7m 17s
August 3, 2023 21:03 7m 17s
Preds now show up on the predship tacmap (#4080) Check for merge conflicts #13112: Commit 36b6bff pushed by github-merge-queue bot
August 3, 2023 20:58 4m 16s master
master
August 3, 2023 20:58 4m 16s
fix typo mistake from matchs to matches. Check for merge conflicts #13111: Pull request #4073 synchronize by Huffie56
August 3, 2023 20:45 2m 41s
August 3, 2023 20:45 2m 41s
Overwatch Console TGUI Refactor Check for merge conflicts #13110: Pull request #4078 synchronize by TheGamerdk
August 3, 2023 20:45 1m 1s
August 3, 2023 20:45 1m 1s
fix typo mistake from matchs to matches. Check for merge conflicts #13109: Pull request #4073 synchronize by Huffie56
August 3, 2023 20:39 13s
August 3, 2023 20:39 13s
adds and rebalances items Check for merge conflicts #13108: Pull request #4103 synchronize by Dorodomki
August 3, 2023 20:25 2m 3s
August 3, 2023 20:25 2m 3s
Almayer control console tgui Check for merge conflicts #13107: Pull request #4066 synchronize by stanalbatross
August 3, 2023 20:21 27s
August 3, 2023 20:21 27s
Almayer control console tgui Check for merge conflicts #13106: Pull request #4066 ready_for_review by stanalbatross
August 3, 2023 20:21 21s
August 3, 2023 20:21 21s
Almayer control console tgui Check for merge conflicts #13105: Pull request #4066 synchronize by stanalbatross
August 3, 2023 20:21 13s
August 3, 2023 20:21 13s
Combistick now uses a chain Check for merge conflicts #13104: Pull request #4104 opened by Zonespace27
August 3, 2023 20:19 9s
August 3, 2023 20:19 9s
adds and rebalances items Check for merge conflicts #13103: Pull request #4103 opened by Dorodomki
August 3, 2023 20:10 15s
August 3, 2023 20:10 15s
Overwatch Console TGUI Refactor Check for merge conflicts #13102: Pull request #4078 synchronize by TheGamerdk
August 3, 2023 19:55 27s
August 3, 2023 19:55 27s
Overwatch Console TGUI Refactor Check for merge conflicts #13101: Pull request #4078 synchronize by TheGamerdk
August 3, 2023 19:53 1m 5s
August 3, 2023 19:53 1m 5s
Overwatch Console TGUI Refactor Check for merge conflicts #13100: Pull request #4078 synchronize by TheGamerdk
August 3, 2023 19:53 12s
August 3, 2023 19:53 12s
Overwatch Console TGUI Refactor Check for merge conflicts #13099: Pull request #4078 synchronize by TheGamerdk
August 3, 2023 19:39 40s
August 3, 2023 19:39 40s
Add security camera console to ARES Chamber (#4059) Check for merge conflicts #13098: Commit c073bd8 pushed by github-merge-queue bot
August 3, 2023 19:21 4m 16s master
master
August 3, 2023 19:21 4m 16s
Auxiliary Support Officer Check for merge conflicts #13097: Pull request #4081 synchronize by morrowwolf
August 3, 2023 19:15 13s
August 3, 2023 19:15 13s
Fixes predator crew monitor console (#4079) Check for merge conflicts #13096: Commit 2c85063 pushed by github-merge-queue bot
August 3, 2023 19:07 4m 18s master
master
August 3, 2023 19:07 4m 18s