# 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 3 messages from 2022-02-17 to 2022-02-23. Participants: Yuri, Phillip Wood, Junio C Hamano. Thread: https://gitlist.dev/t/57432 ## Yuri, 2022-02-17 20:50 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: URL: https://gitlist.dev/e/efdd752b-5cff-c483-80eb-654b53fdde7c%40tsoft.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 ``` ## Phillip Wood, 2022-02-22 16:37 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> URL: https://gitlist.dev/e/3101d7c2-c78c-1f96-a7c6-08979d8f246b%40gmail.com In-Reply-To: ``` 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 > > ``` ## Junio C Hamano, 2022-02-23 21:23 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: URL: https://gitlist.dev/e/xmqqa6ehtgz5.fsf%40gitster.g In-Reply-To: <3101d7c2-c78c-1f96-a7c6-08979d8f246b@gmail.com> ``` Phillip Wood writes: > 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). I wonder if it would make a good #leftoverbit starter project to introduce pull.autoStash so that those who want autostash only when running "git pull" (but not "git merge" or "git rebase") can set it, ignoring the settings of merge/rebase.autoStash variables. Thanks. ```