HELP: 4.3 branch in KDevelop messed up

[Milian Wolff]

Hey all,

I just noticed that apparently I severly messed up the 4.3 branch in the 
KDevelop repo, such that it is now equal to the master branch...

I don't really get how I managed to do this... can someone help me?

http://quickgit.kde.org/index.php?p=kdevelop.git&a=shortlog&h=refs/heads/4.3
http://quickgit.kde.org/index.php?p=kdevelop.git&a=shortlog&h=refs/heads/master

^- those are equal...

The only thing I just did was something like:

$ write change in master branch
$ git stash
$ git checkout 4.3
$ git stash pop
$ git commit
$ do a small fixup change
$ git commit
$ git rebase -i origin 4.3
$ git push

(the commit I thus pushed is this one:
http://quickgit.kde.org/index.php?p=kdevelop.git&a=commit&h=5799abe3b73b5ee1cfda275e463529d47f35e77f)

Help!

-- 
Milian Wolff
mail at milianw.de
http://milianw.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20120417/d36beef6/attachment.sig>