Skip to content

Actions: cmss13-devs/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
2,745 workflow run results
2,745 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Overwatch Console TGUI Refactor (#4178) Check for merge conflicts #14015: Commit c43484e pushed by github-merge-queue bot
August 29, 2023 23:16 4m 15s master
master
August 29, 2023 23:16 4m 15s
notify ghosts Check for merge conflicts #14014: Pull request #4241 synchronize by harryob
August 29, 2023 21:19 14s
August 29, 2023 21:19 14s
notify ghosts Check for merge conflicts #14013: Pull request #4241 synchronize by harryob
August 29, 2023 20:28 13s
August 29, 2023 20:28 13s
Dropship hijack offset change Check for merge conflicts #14012: Pull request #4283 opened by morrowwolf
August 29, 2023 19:54 13s
August 29, 2023 19:54 13s
Fix for CL's lockbox. Check for merge conflicts #14011: Pull request #4282 opened by Segrain
August 29, 2023 17:42 13s
August 29, 2023 17:42 13s
Lesser drone changes Check for merge conflicts #14010: Pull request #4280 synchronize by morrowwolf
August 29, 2023 14:23 17s
August 29, 2023 14:23 17s
Lesser drone changes Check for merge conflicts #14009: Pull request #4280 synchronize by morrowwolf
August 29, 2023 13:24 12s
August 29, 2023 13:24 12s
Lesser drone changes Check for merge conflicts #14008: Pull request #4280 synchronize by morrowwolf
August 29, 2023 13:18 12s
August 29, 2023 13:18 12s
Lesser drone changes Check for merge conflicts #14007: Pull request #4280 synchronize by morrowwolf
August 29, 2023 13:15 14s
August 29, 2023 13:15 14s
Royal Marines Commando Check for merge conflicts #14006: Pull request #4098 synchronize by spartanbobby
August 29, 2023 13:09 16s
August 29, 2023 13:09 16s
Lesser drone changes Check for merge conflicts #14005: Pull request #4280 synchronize by morrowwolf
August 29, 2023 12:29 14s
August 29, 2023 12:29 14s
Lesser drone changes Check for merge conflicts #14004: Pull request #4280 ready_for_review by morrowwolf
August 29, 2023 11:19 12s
August 29, 2023 11:19 12s
Lesser drone changes Check for merge conflicts #14003: Pull request #4280 synchronize by morrowwolf
August 29, 2023 11:16 12s
August 29, 2023 11:16 12s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #14002: Pull request #4274 synchronize by Huffie56
August 29, 2023 11:06 14s
August 29, 2023 11:06 14s
fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #14001: Pull request #4281 synchronize by harryob
August 29, 2023 09:17 15s
August 29, 2023 09:17 15s
General Quarters via ARES no longer cares if Red alert or not (#4227) Check for merge conflicts #14000: Commit a6ed272 pushed by github-merge-queue bot
August 29, 2023 09:07 4m 17s master
master
August 29, 2023 09:07 4m 17s
fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #13999: Pull request #4281 synchronize by harryob
August 29, 2023 08:36 11s
August 29, 2023 08:36 11s
fixes some vehicle stuff, and some random code that ended up commented Check for merge conflicts #13998: Pull request #4281 opened by harryob
August 29, 2023 08:32 16s
August 29, 2023 08:32 16s
Add flanking possiblities to the lifeboat by adding two clamp with doors on each exterior side. Check for merge conflicts #13997: Pull request #4274 synchronize by Huffie56
August 29, 2023 08:10 13s
August 29, 2023 08:10 13s
fix give back marksman ammo to MP's because i remove it in a previous… Check for merge conflicts #13996: Commit a5ab501 pushed by github-merge-queue bot
August 29, 2023 07:26 4m 16s master
master
August 29, 2023 07:26 4m 16s
Added 3 to hypospray transfer amount option (#4272) Check for merge conflicts #13995: Commit 2710dfa pushed by github-merge-queue bot
August 29, 2023 07:11 4m 18s master
master
August 29, 2023 07:11 4m 18s
Fixed funny invisible vines (#4278) Check for merge conflicts #13994: Commit cab4aee pushed by github-merge-queue bot
August 29, 2023 06:57 4m 14s master
master
August 29, 2023 06:57 4m 14s
notify ghosts Check for merge conflicts #13993: Pull request #4241 synchronize by harryob
August 29, 2023 06:42 2m 17s
August 29, 2023 06:42 2m 17s
ARES Change Holder Check for merge conflicts #13992: Pull request #4224 synchronize by realforest2001
August 28, 2023 22:44 1m 55s
August 28, 2023 22:44 1m 55s
Project ARES: Functional Access Tickets Check for merge conflicts #13991: Pull request #4111 synchronize by realforest2001
August 28, 2023 22:44 1m 44s
August 28, 2023 22:44 1m 44s