Re: git error on a pull
Re: git error on a pull
- Subject: Re: git error on a pull
- From: Kieran Kelleher <email@hidden>
- Date: Mon, 12 Mar 2012 12:07:46 -0400
As long as you have no modifications that you have made to Wonder yourself and you just want to clean the build artifacts, just do
$ git reset --hard
which will clear all local modifications (unintentional or otherwise)
HTH, Kieran
On Mar 12, 2012, at 10:04 AM, Theodore Petrosky wrote:
> 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