Improve dialog box message for failed pull when affected locally modified files exist about oxygen-git-client-addon HOT 6 CLOSED

@AlexSmarandache15 - I repeated the experiment with a pull-mere. I get a similar message from command-line Git:

$ git pull
...
error: Your local changes to the following files would be overwritten by merge:
        dita/test1.dita
Please commit your changes or stash them before you merge.
Aborting

and from the Oxygen Git add-on:

and I also confirmed that the message occurs whether the files conflict, don't conflict, or even if they are identical.

So yes, this proposed message would equally apply to both pull-rebase and pull-merge.

Thank you for asking this question!

from oxygen-git-client-addon.

Hi Chris,
I understand and thank you for the suggestion. We will improve the message in the next release.

from oxygen-git-client-addon.

Note: internal issue ID is EXM-52307.

from oxygen-git-client-addon.

Hi @chrispy-snps,

Do you think this message is suitable for both types of pull (rebase and merge)? Or would it only be suitable for rebase?

Cannot pull (%s) changes because your local uncommitted changes to the files below would be overwritten by the incoming remote changes. (These changes might not conflict, but changes in uncommitted files cannot be merged.)
Commit, stash, or discard the local changes and try again.

from oxygen-git-client-addon.

We released version 5.2.0 with the updated message.

from oxygen-git-client-addon.

Thank you @AlexJitianu!

from oxygen-git-client-addon.