Call "git revert" on those files before doing the pull. wondaculous-min.js is rebuilt by the Ant tasks when you build Wonder so the file was locally modified, hence the conflict.
> 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 protected]) > Help/Unsubscribe/Update your Subscription: > https://lists.apple.com/mailman/options/webobjects-dev/probert%40macti.ca > > This email sent to [email protected] _______________________________________________ Do not post admin requests to the list. They will be ignored. Webobjects-dev mailing list ([email protected]) Help/Unsubscribe/Update your Subscription: https://lists.apple.com/mailman/options/webobjects-dev/archive%40mail-archive.com This email sent to [email protected]
