Quoting sig_UVA <[email protected]>:
> 
> Thanks!  I didn't actually work on that file, but it must be part of
> the debugging process and gets changed.  If I delete it locally and
> then do the pull, everything works fine.
> 
> I used "git add ." before my push and commit.  It's very convenient;
> is there a way to do that but exclude that one file that is giving me
> the problem?  I guess the alternative is to just push the files I
> worked on, but then I might miss something....

If that file is autogenerated debug info, it should not be committed
to your repository. I would first do git remove and commit its
removal. Then add a .gitignore file which lists this file as one to be
ignored. 

--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to