[Debian-olpc-devel] Problem while updating sugar-read-activity

[Kandarp Kaushik]

Hello Jonas,
Thanks for letting me know the steps required to update a package in
case it fails to merge with the upstream release.

I followed the steps and was able to successfully run them and execute
what they were intended to do.
There was a small change* in the first step though :

        $ git checkout -b v87 reset-upstream-to-v87
        fatal: git checkout: updating paths is incompatible with
switching branches.
        Did you intend to checkout 'reset-upstream-to-v87' which can
not be resolved as commit?

while
        $ git checkout -b reset-upstream-to-v87 v87
worked.
*in case others are following our conversation.

Regards,
Kandarp.