Il 07 agosto 2017 09:34:37 CEST, "Pali Rohár" <> ha scritto:

>Anyway, I rebased kf5 branch on top of master with (semi-manual)
>conflicts resolution and found out that changes between kf5 branch and
>"kf5 rebased on top of master" differs. And I suspect that some merge
>commits which was done from master to kf5 were incorrectly.

Do you mean merged, not rebased, right? We should never force-rebase, and the 
pushing a new rebased branch would remove the proper temporal reference.
Please fix the merged branch instead.


Reply via email to