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
```
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
