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

[Daniel Blendea <bdaniel7@gmail.com>]

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 <santi@agolina.net> wrote:
> On Thu, Jun 17, 2010 at 11:35 AM, Daniel Blendea <bdaniel7@gmail.com> 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
>