# git pull (Your local changes to ... would be overwritten by merge) 9 messages from 2010-06-17 to 2010-06-18. Participants: Daniel Blendea, Santi Béjar, Michael J Gruber, Matthieu Moy, Eyvind Bernhardsen. Thread: https://gitlist.dev/t/24137 ## Daniel Blendea, 2010-06-17 09:35 Subject: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/AANLkTimeIWseETfYiMajIqesjJ_p55pRislnQQIaCrbG%40mail.gmail.com In-Reply-To: ``` Hello, A while ago I have cloned on my computer a git repo. Since then, the developers have modified several files in the repo. Now I want to update my copy with the latest changes. I do 'git pull' but I get 'Your local changes to .... would be overwritten by merge.  Aborting.' I didn't modified any local file. I tried using 'git stash save' but no luck. How can I make git update and override my local copy? With all the fuss about it, I thought I will handle this operation pretty easily. Thank you, Daniel ``` ## Santi Béjar, 2010-06-17 09:46 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/AANLkTimakxkEzFHSwezpXelLV171zGFEQULNEVpJlrah%40mail.gmail.com In-Reply-To: ``` On Thu, Jun 17, 2010 at 11:35 AM, Daniel Blendea wrote: > Hello, > > A while ago I have cloned on my computer a git repo. > Since then, the developers have modified several files in the repo. > Now I want to update my copy with the latest changes. > > I do 'git pull' but I get 'Your local changes to .... would be > overwritten by merge.  Aborting.' > I didn't modified any local file. I tried using 'git stash save' but no luck. Are they known to git? What is their status (git status)? If they are not known to git, it seams that there are *new* files both in the remote branch and the working copy (new files in the working copy are not saved with 'git stash save'). I would rename/mv the conflicting new files in the working copy, perform the pull and maybe compare the new files from the branch with the ones from the working copy. HTH, Santi ``` ## Daniel Blendea, 2010-06-17 10:20 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/AANLkTinQkCH5OhnoerCJs2x_2uChwaqVPApeezwcYy1o%40mail.gmail.com In-Reply-To: ``` I have no idea, I know git just barely to be able to update my copy once in a while, then build it to get the binaries. I didn't modified anything and the build script builds the binaries in a different location. The file which threw the first error was already in my copy and it was modified in the remote branch. --- Daniel On Thu, Jun 17, 2010 at 12:46, Santi Béjar wrote: > On Thu, Jun 17, 2010 at 11:35 AM, Daniel Blendea wrote: >> Hello, >> >> A while ago I have cloned on my computer a git repo. >> Since then, the developers have modified several files in the repo. >> Now I want to update my copy with the latest changes. >> >> I do 'git pull' but I get 'Your local changes to .... would be >> overwritten by merge.  Aborting.' >> I didn't modified any local file. I tried using 'git stash save' but no luck. > > Are they known to git? What is their status (git status)? > > If they are not known to git, it seams that there are *new* files both > in the remote branch and the working copy (new files in the working > copy are not saved with 'git stash save'). > > I would rename/mv the conflicting new files in the working copy, > perform the pull and maybe compare the new files from the branch with > the ones from the working copy. > > HTH, > Santi > ``` ## Michael J Gruber, 2010-06-17 10:42 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: <4C19FBF8.6010709@drmicha.warpmail.net> URL: https://gitlist.dev/e/4C19FBF8.6010709%40drmicha.warpmail.net In-Reply-To: ``` Daniel Blendea venit, vidit, dixit 17.06.2010 11:35: > Hello, > > A while ago I have cloned on my computer a git repo. > Since then, the developers have modified several files in the repo. > Now I want to update my copy with the latest changes. > > I do 'git pull' but I get 'Your local changes to .... would be > overwritten by merge. Aborting.' > I didn't modified any local file. I tried using 'git stash save' but no luck. > > How can I make git update and override my local copy? > With all the fuss about it, I thought I will handle this operation > pretty easily. If you are sure you have no own modifications which you would miss: git fetch --all git reset --hard origin/master Fetch is pull without trying to merge or rebase anything. the send line resets your master branch to what you just fetched. Most likely the remote side did a non-forward push and brought you in that situation. [Which, on a side note, is one reason why I still believe that git should not create any local branch for a clone. git fetch && git checkout origin/master does not suffer from this issue.] Michael ``` ## Matthieu Moy, 2010-06-17 11:11 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/vpq4oh1zzfs.fsf%40bauges.imag.fr In-Reply-To: <4C19FBF8.6010709@drmicha.warpmail.net> ``` Michael J Gruber writes: > Daniel Blendea venit, vidit, dixit 17.06.2010 11:35: >> Hello, >> >> A while ago I have cloned on my computer a git repo. >> Since then, the developers have modified several files in the repo. >> Now I want to update my copy with the latest changes. >> >> I do 'git pull' but I get 'Your local changes to .... would be >> overwritten by merge. Aborting.' >> I didn't modified any local file. I tried using 'git stash save' but no luck. Which OS? Do you have any crlf conversion enabled? Any filter set in .gitattributes? > Most likely the remote side did a non-forward push and brought you in > that situation. A non-fast forward push would force a non-fast forward pull, possibly/probably with conflicts, but wouldn't trigger this message, which is generated before the merge is actually started. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Daniel Blendea, 2010-06-17 11:18 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/AANLkTinWS0zWhh0d-yrb7eWMEeQenoAF8tA6-l9BRP_q%40mail.gmail.com In-Reply-To: ``` Windows 7, did not change anything related to crlf. I solved the problem with git fetch --all git reset --hard origin/master --- Daniel On Thu, Jun 17, 2010 at 14:11, Matthieu Moy wrote: > Michael J Gruber writes: > >> Daniel Blendea venit, vidit, dixit 17.06.2010 11:35: >>> Hello, >>> >>> A while ago I have cloned on my computer a git repo. >>> Since then, the developers have modified several files in the repo. >>> Now I want to update my copy with the latest changes. >>> >>> I do 'git pull' but I get 'Your local changes to .... would be >>> overwritten by merge.  Aborting.' >>> I didn't modified any local file. I tried using 'git stash save' but no luck. > > Which OS? Do you have any crlf conversion enabled? Any filter set in > .gitattributes? > >> Most likely the remote side did a non-forward push and brought you in >> that situation. > > A non-fast forward push would force a non-fast forward pull, > possibly/probably with conflicts, but wouldn't trigger this message, > which is generated before the merge is actually started. > > -- > Matthieu Moy > http://www-verimag.imag.fr/~moy/ > ``` ## Michael J Gruber, 2010-06-17 11:58 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: <4C1A0DCD.2070906@drmicha.warpmail.net> URL: https://gitlist.dev/e/4C1A0DCD.2070906%40drmicha.warpmail.net In-Reply-To: ``` Daniel Blendea venit, vidit, dixit 17.06.2010 13:18: > Windows 7, did not change anything related to crlf. > > I solved the problem with > > git fetch --all > git reset --hard origin/master I guess this shows that correct diagnostics is not a prerequisite for a successful therapy ;) (The diagnostics really indicate a work tree with local uncommitted modifications.) Michael ``` ## Matthieu Moy, 2010-06-17 15:21 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/vpqbpb9ofby.fsf%40bauges.imag.fr In-Reply-To: <4C1A0DCD.2070906@drmicha.warpmail.net> ``` Michael J Gruber writes: > Daniel Blendea venit, vidit, dixit 17.06.2010 13:18: >> Windows 7, did not change anything related to crlf. I never used Git on Windows, but I think Git sets autocrlf to true by default on Windows. > I guess this shows that correct diagnostics is not a prerequisite for a > successful therapy ;) > > (The diagnostics really indicate a work tree with local uncommitted > modifications.) I'd bet for this kind of issue: http://kerneltrap.org/mailarchive/git/2010/3/9/25215/thread From: Johannes Schindelin Subject: core.autocrlf considered half-assed Didn't follow the outcome in details, but some patches were proposed to improve the situation. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ ``` ## Eyvind Bernhardsen, 2010-06-18 07:44 Subject: Re: git pull (Your local changes to ... would be overwritten by merge) Message-ID: URL: https://gitlist.dev/e/BFBC3418-44C5-484D-8508-60813675409D%40gmail.com In-Reply-To: ``` On 17. juni 2010, at 17.21, Matthieu Moy wrote: > Michael J Gruber writes: > >> I guess this shows that correct diagnostics is not a prerequisite for a >> successful therapy ;) >> >> (The diagnostics really indicate a work tree with local uncommitted >> modifications.) > > I'd bet for this kind of issue: > > http://kerneltrap.org/mailarchive/git/2010/3/9/25215/thread > From: Johannes Schindelin > Subject: core.autocrlf considered half-assed > > Didn't follow the outcome in details, but some patches were proposed > to improve the situation. Finn Arne Gangstad's "safe autocrlf" patch (c480539, currently in next) solves the problem by disabling conversion for files that contain CRs in the repository. -- Eyvind Bernhardsen ```