A (somewhat) problematic merge

[Luiz Romário Santana Rios]

So, I've ported the Calculator applet to QML and I did it in a separate
branch. But, as my work is based on the work already done by bettio, I
merged his branch into mine and continued the work from there. The problem
is that there was a lot of old stuff in his branch (it was branched from an
old master commit), and that got into my branch unnoticed by me.

Until now.

I tried to merge my romariorios/calculator-qml branch directly into master,
but quickly realized that it would bring a lot of old junk to master, for
the aforementioned reasons. My "solution", then, was to do the opposite
first: merge master into romariorios/calculator-qml, so that the rest of
the tree got updated and, then, merge romariorios/calculator-qml into
master, bringing only the relevant changes to the master tree. But I think
that would make the commit history a bit funky.

What should I do?

-- 
Luiz Romário Santana Rios
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20121106/14098254/attachment.html>