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 (Webobjects-dev@lists.apple.com) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com This email sent to arch...@mail-archive.com
