[
https://issues.apache.org/jira/browse/QUARKS-141?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15240452#comment-15240452
]
ASF GitHub Bot commented on QUARKS-141:
---------------------------------------
Github user dlaboss commented on the pull request:
https://github.com/apache/incubator-quarks-website/pull/39#issuecomment-209722297
Nope, it's standard github workflow for the user to rebase their PR's
fork's branch with (conflicting) fresh master content.
```
$ cd ~/git/incubator-quarks-website # the fork's local clone
$ git fetch upstream master
$ git checkout master
$ git rebase upstream/master # clone's master is now up to date
$ git push # the fork's master is now up to date
# fwiw the above is what the earlier mentioned merge-pr's sister script
"rebase-master" does :-)
$ git checkout QUARKS-141
$ git rebase master
... resolve any conflicts as noted by "git status"
# the clone's QUARKS-141 is now up to date
$ git push -f # the fork's QUARKS-141 is now up to date
# if no other conflicting changes have happened on master, the PR should
now report no conflicts
```
> Update existing recipes to use SimpleSimulatedSensor and
> SimulatedTemperatureSensor
> -----------------------------------------------------------------------------------
>
> Key: QUARKS-141
> URL: https://issues.apache.org/jira/browse/QUARKS-141
> Project: Quarks
> Issue Type: Improvement
> Components: Documentation, Web Site
> Reporter: Queenie Ma
> Assignee: Queenie Ma
> Priority: Minor
>
> Recipes to update:
> # [Detecting a sensor value out of expected
> range|http://quarks.incubator.apache.org/recipes/recipe_value_out_of_range.html]
> # [Applying Different Processing Against a Single
> Stream|http://quarks.incubator.apache.org/recipes/recipe_different_processing_against_stream.html]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
