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

Fix broken indentation of some codeblocks #348

Merged
merged 1 commit into from
Feb 24, 2023
Merged

Conversation

Mingun
Copy link
Member

@Mingun Mingun commented Feb 23, 2023

Commit 2691644 from #313 has broken some indentation, and my own PR #291 mention the wrong version number since that the repetition operator is available, so I've fixed both problems.

@hildjj
Copy link
Contributor

hildjj commented Feb 23, 2023

Sorry that I was sloppy when fixing those up. Once I noticed that there were some wrong, I should have checked all of them.

This also needs to land on stable. I guess I cherry-pick this onto my local stable branch, then do a PR where the target is stable?

@Mingun
Copy link
Member Author

Mingun commented Feb 23, 2023

As you wish. Honestly, I managed to forget the workflow that you want to adhere to. Interestingly, when I had making this PR, GitHub reported some strange create PR url which in fact was a compare form instead of a PR making form.

@hildjj
Copy link
Contributor

hildjj commented Feb 23, 2023

According to https://stackoverflow.com/questions/45169565/git-applying-changes-to-two-branches, I think the right way to land this is to have this PR be against the docs-feature branch, which I just created. Then we can merge that branch to stable and to main.

@hildjj
Copy link
Contributor

hildjj commented Feb 23, 2023

Somehow the stable branch got deleted yesterday, so maybe that's why something was odd. I just recreated at the correct branch point.

And no, I don't know what the right workflow is, but let's try this while the stakes are low.

@hildjj hildjj changed the base branch from main to docs-feature February 23, 2023 18:19
@hildjj
Copy link
Contributor

hildjj commented Feb 23, 2023

I tried resetting the base, but that didn't work cleanly, because it still picked up the CHANGELOG.md change that I want to leave on main. I think you'll need to rebase on your side first.

Some broken indentation was fixed later, but some are not
Also mention a correct version when repetition operator was added
@Mingun
Copy link
Member Author

Mingun commented Feb 24, 2023

Done

@hildjj hildjj merged commit 1681d98 into peggyjs:docs-feature Feb 24, 2023
@hildjj
Copy link
Contributor

hildjj commented Feb 24, 2023

Merged to stable and main. Published to site. Found #352 in the process.

@Mingun Mingun deleted the docs branch February 24, 2023 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants