Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Failed to cherry-pick PR #26467: Update submodule to 216.0.0 #455

Closed
SimpleStation14 opened this issue Jun 11, 2024 · 0 comments
Closed

Failed to cherry-pick PR #26467: Update submodule to 216.0.0 #455

SimpleStation14 opened this issue Jun 11, 2024 · 0 comments
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while

Comments

@SimpleStation14
Copy link
Member

Failed to cherry-pick PR: Git error: 1 uncommitted change would be overwritten by merge; class=Merge (22); code=Conflict (-13)

PR body below

Mirror of PR #26467: Update submodule to 216.0.0 from space-wizards space-wizards/space-station-14

f90b97a02442601141fe6578bc5f2760fd09f2af

PR opened by metalgearsloth at 2024-03-27 03:21:03 UTC - merged at 2024-03-27 03:41:42 UTC

PR changed files with additions and deletions.

The PR had the following labels:

  • No C#

Original Body

d
@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Jun 11, 2024
@Pspritechologist Pspritechologist added the Status: Derelict Has not been active for a while label Jun 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Status: Derelict Has not been active for a while
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@Pspritechologist @SimpleStation14