Try to do a git fetch and post the result of the commands git status and
git diff --stat master origin/master


William Seiti Mizuta
@williammizuta
Desenvolvedor da Caelum


On Tue, Jan 15, 2013 at 10:07 PM, JavaSrvcs <jvsr...@gmail.com> wrote:

> I have not changed any code and just tried to do a git pull and get the
> following message:
>
> Updating 527f1ee..18cf73e
> error: Your local changes to the following files would be overwritten by
> merge:
>         java/..../Info.java
> Please, commit your changes or stash them before you can merge.
> Aborting
> ----------
>
>
> I HAVE NOT CHANGED THIS FILE.  It is telling me that my local changes....
> huh? I have not changed or modified the file.
>
> ----
> When I do a $git status I see a lot of other files that begin with:
>
> *#       modified: ..../Some.java*
> <many lines like the above>
>
>
> How do I get out of this mess?  I do not want to reset head.  I want to
> get back to the state where it does not think I have modified a specific
> set of files... namely the files that I did not change.
>
>
> How did I get into this state?  How do I prevent from getting into this
> state in the future?  How do I get out of this state now?
>
>
> thanks for all the help.
>
> J.V.
>
> --
>
>
>

-- 


Reply via email to