[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-panel-devel
Subject:    Force push to plasma-framework
From:       Ben Cooksley <bcooksley () kde ! org>
Date:       2013-08-31 13:03:59
Message-ID: CA+XidOGFA1MuR-Uram9uEYud9ANy98R3x1+cNySsHgjfwQqDjg () mail ! gmail ! com
[Download RAW message or body]

Hi everyone,

Due to an unfortunate accident involving git merge, several branches
of the plasma-framework repository were rendered unusable.

To correct this, two branches have been forcibly rewound. They are:
- master: now at ea1b637
- ivan/shell-switching: now at f8c2ff5.

The following commits have also been blacklisted from entering the repository:
- 89894b9ce0347204b7835d476a11ae24ff77ed5c
- a793df3c7473b25879491163d622acd988c00a5b
- fbb2e749aeaeca987e901e2f0b8046c9f12b578b
- 1fc1fda8331254b01f752fb04a8575b051543fb5
- f68ee1a764513db268644365c7879d3bc9f942bd

If you have any of the above commits in your current checked out
branch, you will need to hard reset it to the upstream version of that
branch before continuing.

Any commits which you have not yet pushed will need to be cherry
picked to the reset branches, or reapplied manually. Do not attempt to
rebase your local branch to correct this under any circumstances.

Regards,
Ben Cooksley
KDE Sysadmin
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel
[prev in list] [next in list] [prev in thread] [next in thread]