Fwd: A wrong merge in KDevelop git

[Filip Brcic]

On Thursday, 19. April 2012. 19.34.07 Milian Wolff wrote:
> Sigh, looks like after effects from my recent git mess-up are popping up:
> 
> 
> ----------  Forwarded Message  ----------
> 
> Subject: A wrong merge in KDevelop git
> Date: Thursday 19 April 2012, 23:34:39
> From: Alexey Morozov <morozov at gmail.com>
> To: Milian Wolff <mail at milianw.de>
> 
> Hi!
> 
> It seems, that script kiddy made a wrong
> merge 46dc789a6af992b929f510c420f0be922a5c2314 in the KDevelop git repo.
> Now both master and 4.3 branches contain sources of the development
> (4.3.60) version of KDevelop.
> 
> Best regards,
> Alexey Morozov
> -----------------------------------------
> 
> Does anyone know what to do now?
> 
> Bye

I believe a "git reset --hard PREVIOUS_HEAD" (where PREVIOUS_HEAD is, 
naturally, whatever was the head of the 4.3 branch before the merge) should do 
the trick. I'm not really a git guru, but I hope this helps.

Best regards,
Filip
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20120419/43c75278/attachment-0001.sig>