Re: git pull (Your local changes to ... would be overwritten by merge)

From: Santi Béjar <santi@agolina.net>
Date: Jun 17, 2010, 09:46 UTC
Message-ID: <AANLkTimakxkEzFHSwezpXelLV171zGFEQULNEVpJlrah@mail.gmail.com>
In-Reply-To: <AANLkTimeIWseETfYiMajIqesjJ_p55pRislnQQIaCrbG@mail.gmail.com>

On Thu, Jun 17, 2010 at 11:35 AM, Daniel Blendea <bdaniel7@gmail.com> wrote:

Show 9 quoted lines

> 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