[Kde-games-devel] KMahjongg archaeology

[Jeremy Whiting]

You can however rebase the branch and push it with a new name
branch-rebased or whatnot just fine.

On Fri, Jan 23, 2015 at 6:45 PM, Roney Gomes <roney477 at gmail.com> wrote:

> 2015-01-22 9:05 GMT-03:00 Jakob Gruber <jakob.gruber at gmail.com>:
> > Hi,
> >
> > To be honest I don't get the issue you guys have with rebasing. Why don't
> > you simply rebase all the changes you want to bring in onto master (or
> > whatever other stable branch you're targeting)?
> >
> > Branches
> >
> > Master
> > Feature
> >
> > rebased, become:
> >
> > Master
> > Master -> Feature
> >
> > No force push required. Of course, merging also works.
>
> That's not true. If the feature branch is already available on the
> remote repository then you won't be able to push to it normally since
> history has been rewritten.
>
> Of course this won't happen if you are pushing your local rebased copy
> to a new branch which, like I said, I cannot create.
> --
> Roney
> _______________________________________________
> kde-games-devel mailing list
> kde-games-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kde-games-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-games-devel/attachments/20150123/d660d105/attachment.html>