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.

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

Failed to cherry-pick PR #26119: Update submodule #203

Closed
SimpleStation14 opened this issue Apr 22, 2024 · 2 comments
Closed

Failed to cherry-pick PR #26119: Update submodule #203

SimpleStation14 opened this issue Apr 22, 2024 · 2 comments
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot

Comments

@SimpleStation14
Copy link
Member

Failed to cherry-pick PR: cannot create a tree from a not fully merged index.; class=Index (10); code=Unmerged (-10)

PR body below

Mirror of PR #26119: Update submodule from space-wizards space-wizards/space-station-14

b581b11f6819dd47f40bb6f3b4d0541097ed06f6

PR opened by PJB3005 at 2024-03-14 19:43:52 UTC


PR changed files with additions and deletions.

The PR had the following labels:

  • No C#

Original Body

asdfasdfasdf

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label Apr 22, 2024
@Pspritechologist
Copy link
Member

asdfasdfasdf

Thanks PJB, eloquent as always :P

@DEATHB4DEFEAT
Copy link
Member

#394

Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this issue Dec 15, 2024
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this issue Dec 15, 2024
angelofallars pushed a commit to angelofallars/Einstein-Engines that referenced this issue Feb 12, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

this is tara's fault


---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Task
- [x] Completed Task

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Copyright law

---------

Co-authored-by: KyuPolaris <[email protected]>
angelofallars pushed a commit to angelofallars/Einstein-Engines that referenced this issue Feb 12, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

this is tara's fault


---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Task
- [x] Completed Task

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![Example Media Embed](https://example.com/thisimageisntreal.png)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Copyright law

---------

Co-authored-by: KyuPolaris <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

No branches or pull requests

3 participants