Rebasing changes the history, so I think you can't do that with repos that have been pushed, right? In which case merge...
matt (from my phone) > On Aug 30, 2016, at 3:41 PM, maxthomas <g...@git.apache.org> wrote: > > Github user maxthomas commented on the issue: > > https://github.com/apache/incubator-joshua/pull/42 > > do you want me to rebase off master, or merge? > > > --- > 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 infrastruct...@apache.org or file a JIRA ticket > with INFRA. > ---
