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

Add revisions documentation - Issue #196 #517

Merged
merged 2 commits into from Oct 11, 2020

Conversation

AdamWorley
Copy link

Pull request that resolves issue #196

@ErikMichelson ErikMichelson added the type: documentation Issues and PRs regarding the documentation label Oct 5, 2020
@ErikMichelson ErikMichelson linked an issue Oct 5, 2020 that may be closed by this pull request
@InnayTool InnayTool added this to the Release 1.6.1 milestone Oct 5, 2020
Copy link
Member

@davidmehren davidmehren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your contribution!
Please use "note" instead of "file", as we already use the "note" wording in the rest of the features page.
Please also sign your work. 😃

@AdamWorley
Copy link
Author

Sorry for the mess of commits I was having trouble with gpg4win.
I hope everything is all good now

@ErikMichelson
Copy link
Member

I've got some minor remarks:

  1. It seems you signed-off some other commits that are already merged to master. Let's get that fixed prior merge. If you need further assistance for this, let us know.
  2. The new section about revisions is on the same level as "Workspace", "View" or "Edit". I would rather move the revision section into the workspace-section. My suggestion would be to place it just below the information about note-permissions.

@AdamWorley
Copy link
Author

Sure I'll move the revision section to under permissions and above embed note.

I've not used commit signing before so I'm not sure how to go about fixing the already merged commits, so any instructions would be great, thanks!

@davidmehren
Copy link
Member

You should be able to do the following:

# Add a new remote upstream with a clean history
git remote add upstream git@github.com:codimd/server.git
# Fetch branches from new remote
git fetch upstream
# Rebase your branch on master
git rebase upstream/master
# Force push to your fork
git push --force

After that this PR should only contain your commits

@SISheogorath
Copy link
Contributor

Great work!

AdamWorley and others added 2 commits October 10, 2020 17:20
Pull request that resolves issue hedgedoc#196

Signed-off-by: Adam Worley <Adam.Worley@ajw-group.com>
Signed-off-by: Adam Worley <Adam.Worley@ajw-group.com>
@AdamWorley
Copy link
Author

Thank you @davidmehren for the instructions, just done them now so all should be good

@davidmehren davidmehren merged commit 8359e70 into hedgedoc:master Oct 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type: documentation Issues and PRs regarding the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add note revisions documentation
5 participants