OOOOPS

[René J.V. Bertin]

On Wednesday January 21 2015 20:51:29 Jaroslaw Staniek wrote:

What's curious is that my working copy seems to have all files with the changes up to and including commit c052d06a923a849a8bd83f4529b7a52208a7a699 , plus of course the single point change I intended to commit. I'm talking of the 2.9 branch, the one I'm tracking and into which I (think I) did a bad push.

I just don't know what to do with it, or how else to fix my mistake.



> I'd vote for editing history or else git blame and bisect becomes rather
> broken. ASAP... before too many folks have to do local fix, namely removing
> calligra/2.9 local branch or:
> http://stackoverflow.com/questions/9813816/git-pull-after-forced-update
> 
> On Wednesday, 21 January 2015, René J.V. <rjvbertin at gmail.com> wrote:
> > On Wednesday January 21 2015 19:02:07 Adam Pigg wrote:
> >> I wrote myself a reminder
> >> https://userbase.kde.org/User:Piggz/CalligraWorkflowInANutshell
> >> maybe it will help
> >>
> >> On Wed Jan 21 2015 at 18:51:00 Jaroslaw Staniek <staniek at kde.org> wrote:
> >>
> >> > Other advices:
> >> > Use git-new-workdir (explained on this list and on the wiki)
> >> > Use git pull -rebase
> >
> > Thanks.
> >
> > Advice aside, am I going to have to try to clean up the mess I made, or
> is it safer if someone else does (I would say it is but don't want to hide
> behind that feeling either).
> >
> > R.
> > _______________________________________________
> > calligra-devel mailing list
> > calligra-devel at kde.org
> > https://mail.kde.org/mailman/listinfo/calligra-devel
> >
> 
>