From: Phillip Wood <phillip.wood123@gmail.com>
Date: Tue, 22 Feb 2022 16:37:44 GMT
Subject: Re: 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: <3101d7c2-c78c-1f96-a7c6-08979d8f246b@gmail.com>
In-Reply-To: <efdd752b-5cff-c483-80eb-654b53fdde7c@tsoft.com>

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
> 
>