From: Yuri <yuri@tsoft.com>
Date: Thu, 17 Feb 2022 20:50:53 GMT
Subject: When rebase.autoStash=true is used, 'git pull' merge process still complains when incoming changes are in a different place of the file than local changes
Message-ID: <efdd752b-5cff-c483-80eb-654b53fdde7c@tsoft.com>

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


Yuri