18/03/2014 23:12, Vincent van Ravesteijn:
Apparently rebasing onto master didn't go without problems. The merge
conflicts were mainly caused by your recent commit "Whitespace only".
That's not the wisest thing to do if you have a branch touch a lot of
code in the same area.
But, it was easily fixed.
I've push the rebased branch to str-metrics-rebased.
Thanks a lot. I have done some more rewriting/reordering/fixup of
commits and am not down to 19 commits. I will stop here since separating
stuff becomes too complicated.
Just a question: the first commit of the branch seems to be
c192745268dc96ba, which does not belong here. Did I misinterpret
something in the qgit output?
If you agree that the branch is in a good enough state, then I will copy
it back tofeatures/str-metrics. How do I do that? Or should I refrain
from doing it?
JMarc
