Earlier today (7 hours ago from now), I've inadvertently merged a pull
request that was based on the master branch into the 2.0 branch. As a
result, all changes from master have been merged into the 2.0 branch,
which was of course not what I wanted.
The 2.0 branch has been reset to a previous state (just before the
faulty merge). As a result, the HEAD sha1 has been changed and the
recent history has been rewritten.
If you have updated a Symfony2 submodule based on the 2.0 branch after
the faulty merge, you will need to update it again to get the new HEAD sha1.
If you have created a fork or updated an existing fork after the faulty
merge, you will also need to reset it to the new HEAD and cherry-pick
your commits.
I'm really sorry for the inconvenience, but we have not found a better
way. Don't hesitate to ask for help if you have trouble recovering from
this issue.
Fabien
--
Fabien Potencier
Sensio CEO - Symfony lead developer
sensiolabs.com | symfony.com | fabien.potencier.org
Tél: +33 1 40 99 80 80
--
If you want to report a vulnerability issue on symfony, please send it to
security at symfony-project.com
You received this message because you are subscribed to the Google
Groups "symfony developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/symfony-devs?hl=en
