[Koha] opac.css' not uptodate. Cannot merge.

[Chris Cormack]

* SANDEEP BHAVSAR (sandeep.bhavsar at gmail.com) wrote:
>    Dear All
> 
>    I have installed Koha 3.05.00.004 thorugh git. Now while updating the
>    version I am getting the error
> 
>    From git://git.koha-community.org/koha
>     * [new tag]         3.02.02    -> 3.02.02
>     * [new tag]         push       -> push
>     * [new tag]         v3.02.03   -> v3.02.03
>     * [new tag]         v3.02.04   -> v3.02.04
>     * [new tag]         v3.02.05   -> v3.02.05
>     * [new tag]         v3.02.06   -> v3.02.06
>     * [new tag]         v3.02.07   -> v3.02.07
>     * [new tag]         v3.02.08   -> v3.02.08
>     * [new tag]         v3.02.09   -> v3.02.09
>     * [new tag]         v3.02.10   -> v3.02.10
>     * [new tag]         v3.04.00   -> v3.04.00
>     * [new tag]         v3.04.01   -> v3.04.01
>     * [new tag]         v3.04.02   -> v3.04.02
>     * [new tag]         v3.04.03   -> v3.04.03
>     * [new tag]         v3.04.04   -> v3.04.04
>    Updating 0252421..147ae6c
>    error: Entry 'koha-tmpl/opac-tmpl/prog/en/css/opac.css' not uptodate.
>    Cannot merge.
> 
Not really a Koha question but a git one.

You have made local changes to the file, and not committed them, so
git can not merge. 

Chris

-- 
Chris Cormack
Catalyst IT Ltd.
+64 4 803 2238
PO Box 11-053, Manners St, Wellington 6142, New Zealand
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.katipo.co.nz/pipermail/koha/attachments/20110921/11cfab52/attachment-0001.pgp>