[Bug]: Lenra upgrade command does not fail

[taorepoara]

What happened?

I tried to use the lenra upgrade command, but the console displays an error due to a conflict on the lenra.yml file, but the CLI does not fail.

There is no help to resolve the problem and t displays to the user that his app is up to date.

What browsers are you seeing the problem on?

No response

Version

lenra_cli 1.0.0-beta.28

Relevant log output

$ lenra upgrade
Mise à jour abe5ee7..398416b
error: Vos modifications locales aux fichiers suivants seraient écrasées par la fusion :
        lenra.yml
Veuillez valider ou remiser vos modifications avant la fusion.
Abandon
This application is already up to date

[taorepoara]

For the record, the problem was on the git pull. I've resolved it by deleting the .lenra/template.git directory.