You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@marmotta.apache.org by Apache Wiki <wi...@apache.org> on 2016/02/02 10:35:29 UTC

[Marmotta Wiki] Trivial Update of "Patches" by SergioFernandez

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Marmotta Wiki" for change notification.

The "Patches" page has been changed by SergioFernandez:
https://wiki.apache.org/marmotta/Patches?action=diff&rev1=2&rev2=3

Comment:
typo

   1. Fetch the changes
    `git fetch <github-user>`
   1. Merge in the changes telling where the change comes from:
-   `git merge --no-commit --no-ff --log -m "MARMOTTA-123: Merge patch from <github-user> on github, closes PR #1234" -m "Obtained from: <github-user> <https://github.com/<github-user>/>" <github-user>/<remote-branch>`
+   `git merge --no-commit --no-ff --log -m "MARMOTTA-123: Merged patch from <github-user> on github, closes PR #1234" -m "Obtained from: <github-user> <https://github.com/<github-user>/>" <github-user>/<remote-branch>`
   1. Examine the changes introduced by the patch. Make sure the code compiles and does what it claims in the pull request.
   Check that
    a. all LICENSE headers are in place (maybe you want to run `mvn apache-rat:check`),