git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Feb 22, 2022, 16:37 UTC
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:
Show 13 quoted lines
> 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
> 
>
Previous: YuriNext: Junio C Hamano
Message 2 of 3 in “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”
  1. YuriFeb 17, 2022
  2. Phillip WoodFeb 22, 2022
  3. Junio C HamanoFeb 23, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.