Skip to content
This repository has been archived by the owner on Apr 27, 2024. It is now read-only.

Actions: SS14-Classic/deep-station-14-archive

Actions

Check Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflict-labeler.yml
18 workflow runs
18 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Reset to Einstein Engines Check Merge Conflicts #18: Pull request #13 opened by Peptide90
April 27, 2024 14:45 12s
April 27, 2024 14:45 12s
enable OOC during rounds Check Merge Conflicts #17: Commit 48a728c pushed by Peptide90
April 20, 2024 13:29 2m 14s master
master
April 20, 2024 13:29 2m 14s
remove all service playtime requirements Check Merge Conflicts #16: Commit 1ad78cf pushed by Peptide90
April 9, 2024 19:58 2m 17s master
master
April 9, 2024 19:58 2m 17s
map fixes Check Merge Conflicts #15: Commit ade4c45 pushed by Peptide90
April 9, 2024 19:47 2m 11s master
master
April 9, 2024 19:47 2m 11s
fixed - invalid error Check Merge Conflicts #14: Commit 5e1e520 pushed by Peptide90
April 9, 2024 18:44 2m 14s master
master
April 9, 2024 18:44 2m 14s
fix captain playtime tracking Check Merge Conflicts #13: Commit d20062c pushed by Peptide90
April 9, 2024 18:39 2m 11s master
master
April 9, 2024 18:39 2m 11s
disable play time requirements for all roles Check Merge Conflicts #12: Commit b617142 pushed by Peptide90
April 9, 2024 12:10 2m 15s master
master
April 9, 2024 12:10 2m 15s
Merge remote-tracking branch 'origin/master' Check Merge Conflicts #11: Commit 2a1aa1b pushed by Peptide90
April 9, 2024 11:21 2m 11s master
master
April 9, 2024 11:21 2m 11s
Merge pull request #12 from SS14-Classic/pillar Check Merge Conflicts #10: Commit 6fe531c pushed by Peptide90
April 9, 2024 10:01 2m 11s master
master
April 9, 2024 10:01 2m 11s
Pillar Check Merge Conflicts #9: Pull request #12 opened by Peptide90
April 9, 2024 09:56 15s
April 9, 2024 09:56 15s
Merge pull request #11 from SS14-Classic/upstream_merge Check Merge Conflicts #8: Commit 9180fa4 pushed by Peptide90
March 2, 2024 16:47 2m 10s master
master
March 2, 2024 16:47 2m 10s
Upstream merge 02/03/2024 Check Merge Conflicts #7: Pull request #11 opened by Peptide90
March 2, 2024 16:18 24s
March 2, 2024 16:18 24s
Languages Check Merge Conflicts #6: Pull request #10 opened by Peptide90
February 26, 2024 13:33 15s
February 26, 2024 13:33 15s
Merge pull request #4 from SS14-Classic/crime_assist_pda Check Merge Conflicts #5: Commit 44280b7 pushed by Peptide90
February 22, 2024 11:48 2m 12s master
master
February 22, 2024 11:48 2m 12s
Missing IPC full state Check Merge Conflicts #4: Commit d0988af pushed by Peptide90
February 22, 2024 11:47 2m 10s master
master
February 22, 2024 11:47 2m 10s
Merge remote-tracking branch 'origin/master' Check Merge Conflicts #3: Commit 5a6a9b5 pushed by Peptide90
February 22, 2024 11:38 2m 11s master
master
February 22, 2024 11:38 2m 11s
Merge pull request #5 from SS14-Classic/ODJ_content Check Merge Conflicts #2: Commit 3ef4bda pushed by Peptide90
February 22, 2024 11:32 2m 12s master
master
February 22, 2024 11:32 2m 12s
Shipyards and bank system from Frontier Station Check Merge Conflicts #1: Pull request #6 opened by Peptide90
February 22, 2024 10:23 14s
February 22, 2024 10:23 14s