doc: Added yaml-metadata doc into hedgedoc frontend #4371
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrdrogdrog
requested changes
Jul 3, 2023
ErikMichelson
requested changes
Jul 3, 2023
|
I have added commits that addresses the requested changes. Please check @mrdrogdrog @ErikMichelson |
ErikMichelson
requested changes
Jul 4, 2023
|
Hi @ErikMichelson I have squashed my commits but I don't quite understand which branch should be rebased into which branch. On my docs-yaml-metadata local branch I tried the command: However, I ran into merge conflicts Could you please guide me through this as I am unfamiliar with rebase. |
mrdrogdrog
force-pushed
the
docs-yaml-metadata
branch
from
a97a7f5
to
f22a51b
Compare
|
Don't rebase on the develop branch if you're creating a PR for master. |
JunedKhan101
force-pushed
the
docs-yaml-metadata
branch
from
f22a51b
to
ce13648
Compare
|
@mrdrogdrog Does it look good now? Or have I done something else that was unnecessary? |
Signed-off-by: Juned Khan <junedkhanc101@gmail.com>
mrdrogdrog
force-pushed
the
docs-yaml-metadata
branch
from
ce13648
to
06899a1
Compare
mrdrogdrog
approved these changes
Jul 6, 2023
|
@ErikMichelson An approval is required from your end to merge this. |
ErikMichelson
approved these changes
Jul 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Component/Part
Documentation
Description
This PR add yaml-metadata documentation to hedgedoc documentaion from public/docs.
Steps
made sure that:
masterfor 1.x & docs,developfor 2.xRelated Issue(s)
#1427