"not up to date" means you have uncommitted changes locally which interfere
with the pull/merge. You should either commit or discard them, then do your
pull.
Tekkub
Github General Support
http://support.github.com/
Join us on IRC: #github on freenode.net
Discussion group: [email protected]
On Thu, Jan 15, 2009 at 12:21 AM, sig_UVA <[email protected]> wrote:
>
> Hi all,
>
> I am very new to github and source control in general. I have been
> able to setup a repo using my laptop and then clone it on my desktop.
> Then I went back to my laptop and made some changes, which I then
> pushed to the repo. So far, so good.
>
> Hopping back on my desktop, I want to pull those changes down.
> Basically, I want each of my computers to update the master trunk.
> Eventually, I'll bring someone else and get into the pull requests,
> but first things first.
>
> I navigate to the project folder that contains my files and type:
>
> git config branch.master.remote origin
> git config branch.master.merge refs/heads/master
> git pull
>
> I get the following error:
>
> Updating a0d9bd7..c394a98
> error: Entry 'bin-debug/CustomerSupport.swf' not uptodate. Cannot
> merge.
>
> I am building this app in Flex Builder 3. Any help you have would be
> great appreciated. Thanks!
>
> -Hunter
>
> >
>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
