• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
git error on a pull
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

git error on a pull

  • Subject: git error on a pull
  • From: Theodore Petrosky <email@hidden>
  • Date: Mon, 12 Mar 2012 07:04:45 -0700 (PDT)
maybe I am doing this wrong.

in eGit, i see my wonder repository. I right click and select Pull. I am getting this error:

Checkout conflict with files:
Frameworks/Ajax/Ajax/WebServerResources/wondaculous-min.js
Frameworks/Ajax/Ajax/WebServerResources/wondaculous.js
Checkout conflict with files:
Frameworks/Ajax/Ajax/WebServerResources/wondaculous-min.js
Frameworks/Ajax/Ajax/WebServerResources/wondaculous.js

I don't understand what I have to do to get the most up-to-date wonder with eGit..

Ted

 _______________________________________________
Do not post admin requests to the list. They will be ignored.
Webobjects-dev mailing list      (email@hidden)
Help/Unsubscribe/Update your Subscription:

This email sent to email@hidden
  • Follow-Ups:
    • Re: git error on a pull
      • From: Kieran Kelleher <email@hidden>
    • Re: git error on a pull
      • From: Pascal Robert <email@hidden>
  • Prev by Date: SQL RTRIM
  • Next by Date: Re: git error on a pull
  • Previous by thread: Re: SQL RTRIM
  • Next by thread: Re: git error on a pull
  • Index(es):
    • Date
    • Thread