Hi Yuri
On 17/02/2022 20:50, Yuri wrote:
I have a file "x" that has one local change and some incoming pulled
changes.
Pulled changes are contextually very far away, so it should be possible
to merge them without user interaction.
But git still complains:
$ git pull
Updating 91bfe02..522ccf2
error: Your local changes to the following files would be overwritten by
merge:
x
pull only uses rebase.autoStash if you ask it to rebase, if it is trying
to merge then you need to pass --autostash on the command line or set
merge.autoStash (assuming you want merge to always use --autostash).
Best Wishes
Phillip
Yuri
