Yes, never rebase commits that have already been pushed (git should not even let you do that), and yes the calligra policy is to merge-squash. -- Cyrille Berger Skott