Pull does a fetch and merge, but you can't merge with uncomitted changes.
If you just want to grab the remote commits, use `git fetch remotename` and
do the merge locally when you're ready to. If you don't want to merge but
instead just want to switch to the remote version, use `git reset --hard
remotename/branchname` after the fetch. This will erase your local changes
though.
Tekkub
GitHub Tech Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Thu, Apr 30, 2009 at 2:06 PM, Dave L <[email protected]> wrote:
>
> I have just started to use git and I am getting this error:
>
> error: Entry 'config/environment.rb' not uptodate. Cannot merge.
>
> I am trying to sync up two computers to use a central repository on
> git and I think I am getting this error b/c I have changed something
> in the environment.rb file on the computer I am trying to pull to.
> How do I go about ignoring this change and overwriting with a pull
> from git?
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
