GSoC Commit History Slight Mess

[Emmet O'Neill]

Hey all, I just wanted to give everyone a bit of a heads up about a small
issue with merging Srirupa's GSoC today.

The short version is that I think Srirupa has made a mistake in the process
of rebasing her work on top of master,
leading to a bit of a mess with multiple duplicate commits and a few extra
commits fixing earlier merge conflicts.

(At first it seemed to be able to be merged onto master with a merge
commit, but doing so would make a mess of our commit history
and as Wolthera rightly pointed out, would make things like bisecting a
nightmare.)

So anyway, git can't really make sense of it so I've started trying to
rebase/clean it up by hand and hopefully I'll have it sorted out sometime
tomorrow.
Emmet
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kimageshop/attachments/20230918/95caf45e/attachment.htm>