Skip to content

Actions: cuberound/cmss13

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
205 workflow runs
205 workflow runs

Filter by Event

⌥ + click/return to exclude

Filter by Status

⌥ + click/return to exclude

Filter by Branch

⌥ + click/return to exclude

Filter by Actor

⌥ + click/return to exclude
Hopefully no merge conflicts this time. Check for merge conflicts #174: Pull request #87 opened by itus2k
7s
7s
USASF props Check for merge conflicts #173: Pull request #77 reopened by itus2k
9s
9s
USASF props Check for merge conflicts #172: Pull request #77 synchronize by itus2k
8s
8s
bunker pipes Check for merge conflicts #171: Pull request #86 opened by 61Mars61
10s
10s
new area, correctly areas cargo atc and workshop Check for merge conflicts #170: Pull request #85 synchronize by DangerRevolution
2m 9s
2m 9s
new area, correctly areas cargo atc and workshop Check for merge conflicts #169: Pull request #85 synchronize by DangerRevolution
9s
9s
new area, correctly areas cargo atc and workshop Check for merge conflicts #168: Pull request #85 synchronize by DangerRevolution
6s
6s
new area, correctly areas cargo atc and workshop Check for merge conflicts #167: Pull request #85 synchronize by DangerRevolution
8s
8s
new area, correctly areas cargo atc and workshop Check for merge conflicts #166: Pull request #85 synchronize by DangerRevolution
9s
9s
new area, correctly areas cargo atc and workshop Check for merge conflicts #165: Pull request #85 opened by DangerRevolution
2m 6s
2m 6s
garage + hospital APC, intel markers and lights + misc changes Check for merge conflicts #164: Pull request #84 opened by DangerRevolution
4m 10s
4m 10s
west medical stair/cargo decal fix + brig sprinkle Check for merge conflicts #163: Pull request #83 opened by 61Mars61
6s
6s
lights, APCs, intel markers in mining colony + decals and minor decor in caves Check for merge conflicts #162: Pull request #82 opened by DangerRevolution
7s
7s
boxing ring maint decor Check for merge conflicts #161: Pull request #81 opened by DangerRevolution
2m 9s
2m 9s
Shiva top level + Hybrisa road top level | CORSAT lower level + hybrisa road lower level Check for merge conflicts #160: Pull request #80 synchronize by DangerRevolution
12s
12s
Shiva top level + Hybrisa road top level | CORSAT lower level + hybrisa road lower level Check for merge conflicts #159: Pull request #80 synchronize by DangerRevolution
8s
8s
Shiva top level + Hybrisa road top level | CORSAT lower level + hybrisa road lower level Check for merge conflicts #158: Pull request #80 synchronize by DangerRevolution
8s
8s
Shiva top level + Hybrisa road top level | CORSAT lower level + hybrisa road lower level Check for merge conflicts #157: Pull request #80 opened by DangerRevolution
2m 10s
2m 10s
cargo vehicle lift + top floor proof of concept Check for merge conflicts #156: Pull request #79 opened by 61Mars61
6s
6s
USASF props Check for merge conflicts #155: Pull request #77 synchronize by itus2k
7s
7s
underground lab decor + misc json changes Check for merge conflicts #154: Pull request #78 ready_for_review by DangerRevolution
9s
9s
underground lab decor + misc json changes Check for merge conflicts #153: Pull request #78 opened by DangerRevolution
6s
6s
USASF props Check for merge conflicts #152: Pull request #77 synchronize by itus2k
7s
7s
USASF props Check for merge conflicts #151: Pull request #77 opened by itus2k
8s
8s
expands stairs + puts tile under stairs Check for merge conflicts #150: Pull request #76 synchronize by DangerRevolution
9s
9s