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

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
YYuri <yuri@tsoft.com>
Date
Feb 17, 2022, 20:50 UTC
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
Next: Phillip Wood
Message 1 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.