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. <rjvber...@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 <stan...@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@kde.org > https://mail.kde.org/mailman/listinfo/calligra-devel > -- regards, Jaroslaw Staniek KDE: : A world-wide network of software engineers, artists, writers, translators : and facilitators committed to Free Software development - http://kde.org Calligra Suite: : A graphic art and office suite - http://calligra.org Kexi: : A visual database apps builder - http://calligra.org/kexi Qt Certified Specialist: : http://www.linkedin.com/in/jstaniek
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
