[Qgis-community-team] tex to rst conversion

[Alexander Bruy]

Hi again,

just tried to update my repo using next commands

git fetch upstream
git merge upstream/master

where upstream is a QGIS original documentation repo
I get errors

warning: too many files (created: 4250 deleted: 7468), skipping
inexact rename detection
error: refusing to lose untracked file at
'source_latex/german_de/plugins_geoprocessing_images/icon_buffer.png'
error: refusing to lose untracked file at
'source_latex/german_de/plugins_grass_module_images/db.connect.1.png'
error: refusing to lose untracked file at
'source_latex/german_de/plugins_grass_module_images/db.connect.schema.1.png'
....
CONFLICT (rename/delete): Rename
russian_ru/plugins_geoprocessing_images/icon_buffer.png->source_latex/german_de/plugins_geoprocessing_images/icon_buffer.png
in upstream/master and deleted in HEAD
CONFLICT (rename/delete): Rename
russian_ru/plugins_grass_module_images/db.connect.1.png->source_latex/german_de/plugins_grass_module_images/db.connect.1.png
in upstream/master and deleted in HEAD
...
Automatic merge failed; fix conflicts and then commit the result.

Any hints how to resolve this? Maybe I should reclone whole repository?

2012/4/19 Otto Dassau <dassau at gbd-consult.de>:
> Hi Alex,
>
> perfect and thanks.
>
> Regards
> Otto

-- 
Alexander Bruy