Re: git error on a pull

2012-03-15 Thread David Avendasora
Works for me! I'd buy extras. Dave On Mar 13, 2012, at 10:16 AM, Kieran Kelleher wrote: > +1 :-p > > > On Mar 12, 2012, at 9:08 PM, Chuck Hill wrote: > >> I think we should make that the 2012 WOWODC T-Shirt: WebObjects - so easy >> that even Dave Avendasora can do it!

Re: git error on a pull

2012-03-12 Thread Kieran Kelleher
+1 :-p On Mar 12, 2012, at 9:08 PM, Chuck Hill wrote: > I think we should make that the 2012 WOWODC T-Shirt: WebObjects - so easy > that even Dave Avendasora can do it! ___ Do not post admin requests to the list. They will be ignored. Webobjects-

Re: git error on a pull

2012-03-12 Thread Chuck Hill
On 2012-03-12, at 6:06 PM, David Avendasora wrote: > > On Mar 13, 2012, at 12:09 AM, Kieran Kelleher wrote: > >> Of course it always a good idea to do 'git status' first to see what actual >> modifications exist in your working copy. > > Is it just me that finds great irony in the Irish g

Re: git error on a pull

2012-03-12 Thread David Avendasora
On Mar 13, 2012, at 12:09 AM, Kieran Kelleher wrote: > Of course it always a good idea to do 'git status' first to see what actual > modifications exist in your working copy. Is it just me that finds great irony in the Irish guy being the voice of reason?? :-P (still getting payback for

Re: git error on a pull

2012-03-12 Thread Kieran Kelleher
Of course it always a good idea to do 'git status' first to see what actual modifications exist in your working copy. On Mar 12, 2012, at 12:07 PM, Kieran Kelleher wrote: > As long as you have no modifications that you have made to Wonder yourself > and you just want to clean the build arti

Re: git error on a pull

2012-03-12 Thread Kieran Kelleher
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: > may

Re: git error on a pull

2012-03-12 Thread Pascal Robert
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 > getti

git error on a pull

2012-03-12 Thread Theodore Petrosky
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: