Re: GIT and the weird merge conflict.

2012-03-25 Thread Jesse Tayler
Ok, got it - thanks all - ___ 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

Re: GIT and the weird merge conflict.

2012-03-25 Thread Jesse Tayler
I followed here http://wiki.wocommunity.org/display/WONDER/Working+with+Wonder+source+in+Eclipse but I get the same compile errors - WOnder loads in as a long list of folders from Ajax through YUI I figured I'd build an install somehow? Or is it a configuration that tells Eclipse where it is f

Re: GIT and the weird merge conflict.

2012-03-25 Thread Jesse Tayler
On Mar 25, 2012, at 9:39 PM, prob...@macti.ca wrote: > GOLipse don't install Wonder, so a new installation of Eclipse won't update > Wonder. whoa! major misunderstanding! I guess it sees the leftover WOnder from a year or two ago somewhere on this machine. I should just connect to GIT and

Re: GIT and the weird merge conflict.

2012-03-25 Thread probert
Envoyé de mon iPhone Le 2012-03-25 à 21:35, "Jesse Tayler" a écrit : > oh? are you certain? how can I tell for certain what I'm building against? Check the dates on ERJars.framework > I literally just used golipse within the last two weeks -- so, that was like > last on my list of possibili

Re: GIT and the weird merge conflict.

2012-03-25 Thread Jesse Tayler
oh? are you certain? how can I tell for certain what I'm building against? I literally just used golipse within the last two weeks -- so, that was like last on my list of possibilities! On Mar 25, 2012, at 9:28 PM, Jesse Tayler wrote: > I'm still struggling here - > > It's not GIT, I only ha

Re: GIT and the weird merge conflict.

2012-03-25 Thread probert
Envoyé de mon iPhone Le 2012-03-25 à 21:28, "Jesse Tayler" a écrit : > I'm still struggling here - > > It's not GIT, I only had to actually commit it seems-- > > there are code changes that don't compile, but the person who checked in > these lines of code hasn't had trouble with this metho

Re: GIT and the weird merge conflict.

2012-03-25 Thread Jesse Tayler
I'm still struggling here - It's not GIT, I only had to actually commit it seems-- there are code changes that don't compile, but the person who checked in these lines of code hasn't had trouble with this method change== protected ERXRestFormat defaultFormat() { return E