[Digikam-devel] Re: kipi-plugins 2.0 branch merged

[Gilles Caulier]

2011/3/2 Matthias Welwarsky <matthias at welwarsky.de>:
> On Tuesday 01 March 2011 21:51:45 Marcel Wiesweg wrote:
>> Hi,
>>
>> the "2.0" branch of kipi-plugins has been merged to master,
>> heading for KDE 4.7.
>> In your local repositories, checkout master, pull, delete your local 2.0
>> branch, and cleanup:
>> git checkout master
>> git pull
>> git branch -d 2.0
>> git remote prune origin
>> (assuming you have no local commits. If you have, rebase or cherry-pick)
>
> Hello Marcel,
>
> thanks for the notice. I tried syncing my local stuff yesterday night and
> noticed that I could not pull into my 2.0 any more. So we're now on "master",
> that's fine. Are there more transitions to be expected soon or are we done for
> now?
>
> regards,
> matthias

digiKam still to be merged from 2.0 to master

Gilles Caulier