Rebase of kopete branch and push it to master

[Alexander Semke]

On 16.01.2018 09:20, Pali Rohár wrote:
>
>> Did you try already
>> 1. merge the current master to master-kf5 and finish all the porting stuff
> If you by "merge" means only git merge without git push, then this
> operation does nothing.
Of course you have to push after the merge. But you can try to do the 
merge and to check the history first.
Instead of bringing in hundreds of commits with a rebase you would bring 
in one single merge commit.
If you're ok with the history, do the push.


>   Commit on top of master branch is also ancestor
> accessible from master-kf5.
Why do you want to care about master-kf5 at all once you brought 
everything into master?

>> 2. merge master-kf5 back into master
> See above, it does nothing. And git push (after git merge) is failing.
It brings all porting changes done in master-kf5 into master. Push 
shouldn't fail in this case because you will end up with one single 
merge commit.

-- 
Alexander