Re: GIT and the weird merge conflict.
Re: GIT and the weird merge conflict.
- Subject: Re: GIT and the weird merge conflict.
- From: email@hidden
- Date: Sun, 25 Mar 2012 21:39:13 -0400
Envoyé de mon iPhone
Le 2012-03-25 à 21:35, "Jesse Tayler" <email@hidden> 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 possibilities!
GOLipse don't install Wonder, so a new installation of Eclipse won't update Wonder.
>
> On Mar 25, 2012, at 9:28 PM, Jesse Tayler <email@hidden> wrote:
>
>> 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 ERXRestFormat.html();
>> }
>>
>> That method above doesn't exist, but this method does:
>>
>> protected ERXRestFormat defaultFormat() {
>> return ERXRestFormat.HTML;
>> }
>>
>> So, if I change those methods, they compile now - maybe there was an API change on that? Does anyone know?
>>
>> There's also an added ERRestDelegate method which won't compile at all
>>
>> public class UserRestDelegate extends ERXAbstractRestDelegate {
>>
>> which can't import
>>
>> import er.rest.ERXRestContext;
>>
>> and fails to compile.
>>
>> seems that these would have compiled on the computer they got checked in from---
>>
>> does anyone have an idea how I could be getting these compile errors or why I had to change code that likely compiled on another developer system (since they checked in the code!)
>>
>> thanks for any thoughts --
>>
>>
>> On Mar 25, 2012, at 1:18 PM, Jesse Tayler <email@hidden> wrote:
>>
>>> Ack! Help!
>>>
>>> I had some merge conflicts using GIT -- I've not used GIT with Eclipse much yet, but I have checked in and out and merged at least once or twice with this new repository.
>>>
>>> The codebase is two years old or so and the actual merge changes are small and not unusual.
>>>
>>> I had a lot of odd Java errors with imports and errors reported on files that were empty or unchanged some of them were cleared with a make-clean, but other errors appeared in their place it seems --
>>>
>>> I'm thinking of abandoning and doing a clean checkout to try and merge back any work I had before this merge!
>>>
>>> All I said with git was:
>>>
>>> git commit -a
>>>
>>> which reminded me that I had to sync with changes, so fine -
>>>
>>> git push
>>>
>>> git pull
>>>
>>> A few files had no changes or were empty like these woo and wod files, the MainPage.java file cleared it's import problem after a make clean....
>>>
>>> # Changed but not updated:
>>> # (use "git add <file>..." to update what will be committed)
>>> # (use "git checkout -- <file>..." to discard changes in working directory)
>>> #
>>> # unmerged: WOMan/Components/MainPage.wo/MainPage.wod
>>> # unmerged: WOMan/Components/MainPage.wo/MainPage.woo
>>> # modified: WOMan/Sources/wo/man/DirectAction.java
>>> #
>>>
>>>
>>> <PastedGraphic-2.tiff>
>>>
>>> So, the java cleared up, but the wod and woo files still won't get off their error markings - no errors exist.
>>>
>>> and now other Java files are doing this import troubles so the make-clean just seems to have changed the place where these errors are reported! weird huh?
>>>
>>>
>>> <Screen Shot 2012-03-25 at 1.08.00 PM.png>
>>>
>>>
>>> So, I realize I'm chasing red herrings here because these errors are false, but at the same time, I can't convince Eclipse to go on and run the damn app --
>>>
>>> Has anyone had this kind of behavior from Eclipse? Any suggestions how best to more though with the least destruction to whatever work I might have done?
>>>
>>> _______________________________________________
>>> 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
>
>
> _______________________________________________
> 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