On Monday 07 August 2017 10:26:46 Luigi Toscano wrote: > Il 07 agosto 2017 09:34:37 CEST, "Pali Rohár" <pali.ro...@gmail.com> 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?
I mean real git rebase but result in new temporary branch. > We should never force-rebase, and the pushing a new rebased branch would > remove the proper temporal reference. > Please fix the merged branch instead. But first we need to know what needs to be fixed. And for this purpose I would push this new (temporary) branch so other people would be able to see git diff between them. -- Pali Rohár pali.ro...@gmail.com
