-
Notifications
You must be signed in to change notification settings - Fork 122
[CM H1] fixed mount plugin tutorial, as mentioned on tuwel #3723
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
…w from shell format (shfmt was breaking it) and ran formatter
…dded version blacklist
- added release notes - set JNA project to build SNAPSHOT version by default
…created new issue ElektraInitiative#3754 to track javadoc improvements)
…ect because of unmitigated reformatter issue
…l checker ci: unix instead of Unix
… specializations
Co-authored-by: markus2330 <markus2330@users.noreply.github.com>
Co-authored-by: Mihael Pranjić <mpranj@limun.org>
…mented out the (only) 3 usages of ksRewind in NativePlugin to isolate problem (problem cannot be reproduced locally on my machine)
…rily commented out the (only) 3 usages of ksRewind in NativePlugin to isolate problem (problem cannot be reproduced locally on my machine)" This reverts commit 6b91332.
… fedora Dockerfiles to prevent error: "Could not find tools.jar. Please check that /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.282.b08-0.fc32.x86_64/jre contains a valid JDK installation."
…emon via gradle.properties
…s not including patch version
Co-authored-by: markus2330 <markus2330@users.noreply.github.com>
…ntation-keyset Improve documentation of keyset.c with suggestions from API review
…ntation-keymeta Improve documentation of keymeta.c with suggestions from API review
…ntation-key-2 Improve documentation of key.c with suggestions from API review
…ntation-keyname Improve documentation of keyname.c with suggestions from API review
Add packaging section in news. Fix my name in docu.
Any news here? This PR needs a rebase and has open review points. |
Hey, I rebased from master and added a better description, is it fine now? |
Thank you! Your PR looks good, but there are still merge conflicts. Are you sure you rebased from current upstream/master and not an outdated master branch? See the docs for hints how to work with and sync forks. |
…t/mod/forum/discuss.php?d=243029#p598964 and issue ElektraInitiative#3722, also added sudo to the first command, which is necessary anyway
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like something went wrong. There is a merge commit which should not be there when rebasing and the PR contains about 390 unrelated commits.
I created #3805, which is a rebased copy of this PR, as an example how it should look.
thank you for fixing this, sorry for the hassle when I tried rebasing to upstream/master it did work, but when I tried to push it, my IDE wanted me to merge otherwise my push was rejected. As far as I understood it, I should have reverted the merges I did before and make like a "clean" rebase, correct? |
Thank you for the PR and the documentation fixes! It was merged via #3805.
Afair I simply copied your branch and then rebased from upstream/master again and this already removed the merge commit. Then I fixed some merge errors that were done before (duplicate news entries). |
Tuwel issue: https://tuwel.tuwien.ac.at/mod/forum/discuss.php?d=243029#p598964
closes #3722 & also added sudo to the first command, which is necessary anyway
Basics
These points need to be fulfilled for every PR:
(added as entry in
doc/news/_preparation_next_release.md
whichcontains
_(my name)_
)Please always add something to the release notes.
(first line should have
module: short statement
syntax)close #X
, are in the commit messages.doc/news/_preparation_next_release.md
scripts/dev/reformat-all
If you have any troubles fulfilling these criteria, please write
about the trouble as comment in the PR. We will help you.
But we cannot accept PRs that do not fulfill the basics.
Checklist
Check relevant points but please do not remove entries.
For docu fixes, spell checking, and similar none of these points below
need to be checked.
(not in the PR description)
Review
Reviewers will usually check the following:
Labels
If you are already Elektra developer:
say that everything is ready to be merged.