• Open Menu Close Menu
  • Apple
  • Shopping Bag
  • Apple
  • Mac
  • iPad
  • iPhone
  • Watch
  • TV
  • Music
  • Support
  • Search apple.com
  • Shopping Bag

Lists

Open Menu Close Menu
  • Terms and Conditions
  • Lists hosted on this site
  • Email the Postmaster
  • Tips for posting to public mailing lists
Re: GIT and the weird merge conflict.
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: GIT and the weird merge conflict.


  • Subject: Re: GIT and the weird merge conflict.
  • From: Jesse Tayler <email@hidden>
  • Date: Sun, 25 Mar 2012 21:44:42 -0400


On Mar 25, 2012, at 9:39 PM, email@hidden 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 get Wonder head right into Eclipse then right? 

Basically just as I'm doing with my app itself? Eclipse is aware of the GIT connection and it all just works.

I figure I should be on the common build of WOnder for sure.

Should I find and remove old files or what do folks suggest?


 _______________________________________________
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: 
 >Re: GIT and the weird merge conflict. (From: Jesse Tayler <email@hidden>)
 >Re: GIT and the weird merge conflict. (From: Jesse Tayler <email@hidden>)
 >Re: GIT and the weird merge conflict. (From: email@hidden)

  • Prev by Date: Re: GIT and the weird merge conflict.
  • Next by Date: Re: GIT and the weird merge conflict.
  • Previous by thread: Re: GIT and the weird merge conflict.
  • Next by thread: Re: GIT and the weird merge conflict.
  • Index(es):
    • Date
    • Thread