Re: How to merge rebased branch properly?

[Cyrille Berger]

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
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel