Skip to content

Merge in new content#30

Merged
mOctave merged 3 commits intomoctave-merc-prologuefrom
main
Dec 28, 2024
Merged

Merge in new content#30
mOctave merged 3 commits intomoctave-merc-prologuefrom
main

Conversation

@mOctave
Copy link
Contributor

@mOctave mOctave commented Dec 28, 2024

No description provided.

TheGiraffe3 and others added 3 commits December 7, 2024 08:56
Co-authored-by: mOctave <73318970+mOctave@users.noreply.github.com>
This will allow a ruleset to enforce checks passing.
@mOctave
Copy link
Contributor Author

mOctave commented Dec 28, 2024

We really should figure out how to get the button that does this for you... unless that requires forks?

@mOctave mOctave merged commit 010256e into moctave-merc-prologue Dec 28, 2024
6 checks passed
@TheGiraffe3
Copy link
Member

I believe it is forking that adds the button.
Realized, though, that you can merge in main on the command line because we're in the same repository: git merge main
Might be the best way to operate if a branch isn't in PR?

@TheGiraffe3
Copy link
Member

TheGiraffe3 commented Dec 28, 2024

Oh, and it looks like this didn't work because it got squashed; the branch still thinks it's three commits behind.

@mOctave
Copy link
Contributor Author

mOctave commented Dec 28, 2024

Ugh. Well, I can always try again from the command line...

I should maybe fix nano again (bad Apple, why is nano an alias for pico) and figure out how to get my terminal to use it instead of vim.

@TheGiraffe3 TheGiraffe3 added the content New content that does not fit a different category label Nov 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

content New content that does not fit a different category

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

Comments