Hi all,
This has now been corrected - KDE/4.9 has been rewound to
f7fb0c10fa6bc04082963fa5863c579d560dc4a1.
I have also blacklisted one of the commit hashes so this cannot
re-enter the repository.
You need to run "git reset --hard origin/KDE/4.9" with the KDE/4.9
branch checked out to reset yours
Christoph Feck wrote:
> On Sunday 11 November 2012 12:00:05 Pino Toscano wrote:
>> Hi,
>>
>> somehow the master branch of kde-workspace has been merged in the
>> KDE/4.9 branch, with obvious consequences.
>> Can anyone please fix this mess?
>>
>> Thanks,
>
> Uh oh, I think I did "git reset orig
On domingo, 11 de novembro de 2012 12.48.15, Christoph Feck wrote:
> Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch,
> to get rid of an initial commit I made in that branch. So HEAD doesn't
> refer to the remote head in the current branch, but always to the head
> of maste
On Sunday 11 November 2012 12:00:05 Pino Toscano wrote:
> Hi,
>
> somehow the master branch of kde-workspace has been merged in the
> KDE/4.9 branch, with obvious consequences.
> Can anyone please fix this mess?
>
> Thanks,
Uh oh, I think I did "git reset origin/HEAD --hard" in the 4.9 branch,
Hi,
somehow the master branch of kde-workspace has been merged in the
KDE/4.9 branch, with obvious consequences.
Can anyone please fix this mess?
Thanks,
--
Pino Toscano
signature.asc
Description: This is a digitally signed message part.