Clone a new copy of your fork just to be safe; checkout your SPARK-1154 branch; git pull --rebase [email protected]:apache/spark.git master; now your and Kelvin's changes should appear last, after everything that is already in master; push origin +SPARK-1154-cleanup-app-folders -- and you're golden.
On Thu, Apr 3, 2014 at 12:50 AM, velvia <[email protected]> wrote: > Github user velvia commented on the pull request: > > https://github.com/apache/spark/pull/288#issuecomment-39421885 > > Sorry, but how do I do a rebase safely, now that I've pushed? I've > never > had good luck with rebases (other than rebase -i before I push.... > sorry > should have done that.) > > > On Wed, Apr 2, 2014 at 6:00 PM, Aaron Davidson < > [email protected]>wrote: > > > Mind doing a rebase to simplify the diff? It'll be squashed anyhow > when we > > merge it into master. > > > > -- > > Reply to this email directly or view it on GitHub< > https://github.com/apache/spark/pull/288#issuecomment-39402284> > > . > > > > > > -- > The fruit of silence is prayer; > the fruit of prayer is faith; > the fruit of faith is love; > the fruit of love is service; > the fruit of service is peace. -- Mother Teresa > > > --- > 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. > --- >
