A wrong merge in KDevelop git

[Nicolás Alvarez]

2012/4/19, Nicolás Alvarez <nicolas.alvarez at gmail.com>:
> 2012/4/19, Milian Wolff <mail at milianw.de>:
>> Sigh, looks like after effects from my recent git mess-up are popping up
>
> I have locked the kdevelop repository and (again) force-pushed the
> correct commit into 4.3.
>
> @Everyone: You may need to "git pull --rebase" 4.3, especially if you
> have local changes. Ask in the list or in #kde-git if you have any
> trouble.
>
> I'll keep the repo locked for a while, until scripty is set up to
> avoid pushing the bad stuff again, and to give time for people in the
> list to see this and update their local repos.

I unlocked the repository, and made the server hooks keep this
particular merge commit (from scripty) from getting pushed again (eg.
if one of you pulled it and now you push it back).

-- 
Nicolás