Skip to content

Actions: cuberound/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
42 workflow run results
42 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Automatic TGS DMAPI Update (#7117) Check for merge conflicts #42: Commit 5fe6ea6 pushed by cuberound
September 5, 2024 15:40 12s master
master
September 5, 2024 15:40 12s
fixes duplicate brown shoes in code (#6928) Check for merge conflicts #41: Commit 6cb3ce6 pushed by cuberound
August 22, 2024 16:48 13s master
master
August 22, 2024 16:48 13s
eh Check for merge conflicts #40: Commit bf111e1 pushed by cuberound
August 22, 2024 16:35 12s master
master
August 22, 2024 16:35 12s
Some refactoring Check for merge conflicts #39: Pull request #14 synchronize by SerheyKr
August 22, 2024 06:46 11s
August 22, 2024 06:46 11s
Some refactoring Check for merge conflicts #38: Pull request #14 synchronize by SerheyKr
August 22, 2024 04:16 11s
August 22, 2024 04:16 11s
Some refactoring Check for merge conflicts #37: Pull request #14 synchronize by SerheyKr
August 22, 2024 04:05 12s
August 22, 2024 04:05 12s
Some refactoring Check for merge conflicts #36: Pull request #14 synchronize by SerheyKr
August 22, 2024 04:01 11s
August 22, 2024 04:01 11s
Some refactoring Check for merge conflicts #35: Pull request #14 opened by SerheyKr
August 22, 2024 03:48 13s
August 22, 2024 03:48 13s
UPP req console code refactoring Check for merge conflicts #34: Pull request #13 synchronize by SerheyKr
August 22, 2024 01:04 11s
August 22, 2024 01:04 11s
UPP req console code refactoring Check for merge conflicts #33: Pull request #13 opened by SerheyKr
August 22, 2024 00:58 12s
August 22, 2024 00:58 12s
Bug fix Check for merge conflicts #32: Pull request #12 opened by SerheyKr
August 21, 2024 17:11 14s
August 21, 2024 17:11 14s
Fixing papers and adding random crate to UPP req Check for merge conflicts #31: Pull request #11 opened by SerheyKr
August 21, 2024 15:37 14s
August 21, 2024 15:37 14s
Some minor stuff Check for merge conflicts #30: Pull request #10 opened by SerheyKr
August 21, 2024 14:35 4m 12s
August 21, 2024 14:35 4m 12s
Merge branch 'cmss13-devs:master' into master Check for merge conflicts #29: Commit 7ca1c52 pushed by cuberound
August 21, 2024 13:19 14s master
master
August 21, 2024 13:19 14s
Removing Large General Pouch from UPP accessories Check for merge conflicts #28: Pull request #9 synchronize by SerheyKr
August 20, 2024 22:57 11s
August 20, 2024 22:57 11s
Removing Large General Pouch from UPP accessories Check for merge conflicts #27: Pull request #9 opened by SerheyKr
August 20, 2024 22:55 10s
August 20, 2024 22:55 10s
Adding UPP console stuff Check for merge conflicts #26: Pull request #8 opened by SerheyKr
August 20, 2024 22:24 10s
August 20, 2024 22:24 10s
Updating UPP crates, some paper stuff Check for merge conflicts #25: Pull request #7 synchronize by SerheyKr
August 20, 2024 15:28 11s
August 20, 2024 15:28 11s
Updating UPP crates, some paper stuff Check for merge conflicts #24: Pull request #7 synchronize by SerheyKr
August 20, 2024 14:05 14s
August 20, 2024 14:05 14s
Updating UPP crates, some paper stuff Check for merge conflicts #23: Pull request #7 synchronize by SerheyKr
August 20, 2024 13:51 11s
August 20, 2024 13:51 11s
Updating UPP crates, some paper stuff Check for merge conflicts #22: Pull request #7 synchronize by SerheyKr
August 20, 2024 13:49 11s
August 20, 2024 13:49 11s
Updating UPP crates, some paper stuff Check for merge conflicts #21: Pull request #7 opened by SerheyKr
August 20, 2024 13:30 23s
August 20, 2024 13:30 23s
Fixing crate types and some names. Adding circuit for UPP req console… Check for merge conflicts #20: Pull request #6 opened by SerheyKr
August 20, 2024 01:01 11s
August 20, 2024 01:01 11s
Adding basic stuff to UPP req console Check for merge conflicts #19: Pull request #5 opened by SerheyKr
August 19, 2024 18:57 11s
August 19, 2024 18:57 11s
Fixing UPP weapon vendor #2. Removing points from UPP cargo vendor Check for merge conflicts #18: Pull request #4 opened by SerheyKr
August 19, 2024 15:02 11s
August 19, 2024 15:02 11s