DmitryK mentioned some other possibility to preserve history, to create another branch and merge that new branch.
I would like to preserve the commits as I dropped some code that might be needed again and squash will destroy history of the branch. Dmitry,can you explain the solution with more details (git commands ideally)? What should be done to preserve history and have easy merge? Lukas 2013/9/7 Cyrille Berger <cber...@cberger.net> > 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<https://mail.kde.org/mailman/listinfo/calligra-devel> >
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
