Lists

Terms and Conditions
Lists hosted on this site
Email the Postmaster
Tips for posting to public mailing lists

Re: git error on a pull

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: git error on a pull

Subject: Re: git error on a pull
From: Pascal Robert <email@hidden>
Date: Mon, 12 Mar 2012 10:08:43 -0400

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@hidden)
> Help/Unsubscribe/Update your Subscription:
>
> This email sent to email@hidden


 _______________________________________________
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

References:
	>git error on a pull (From: Theodore Petrosky <email@hidden>)

Prev by Date: git error on a pull
Next by Date: Inappropriate OGNL expression
Previous by thread: git error on a pull
Next by thread: Re: git error on a pull
Index(es):
- Date
- Thread