[Bug]: Polyscope dropped my local code changes forever

[mnapoli]

Platform

macOS

Operating system version

macOS latest

System architecture

ARM64 (M1, M2, etc)

PolyScope Version

latest

Bug description

I was working on my repository with PhpStorm (not a CoW, nothing to do with Polyscope) and used Polyscope to fix a small issue in a CoW.

I then asked Polyscope to merge and push to main, and it did that in the main project, resetting my local changes (and thus dropping them).

Steps to reproduce

No response

Relevant log output

[mpociot]

Sorry to hear this, Matthieu!
We merge by providing a prompt and the agent then tries to push your polyscope changes to the local branch via the git file protocol. If there are any unstaged changes the merge will fail and the agent will improvise to fix this, which in your case ended up resetting the local data.
I have modified the prompt to ensure local data should never be reset.

[mnapoli]

Thanks!