You are viewing a plain text version of this content. The canonical link for it is here.

Posted to user@ofbiz.apache.org by BJ Freeman <bj...@free-man.net> on 2008/08/09 19:01:34 UTC

Update show conflicts

showing conflicts for startofbiz.sh and .bat
any idea how to resolve this?

Re: Update show conflicts

Posted by BJ Freeman <bj...@free-man.net>.

hmmm don't think I changed them.
that is what had me puzzled.
thank for the direction.

Raj Saini sent the following on 8/9/2008 10:54 AM:
> Conflicts happens if you have local changes. You have two choices:
> 
> 1. Merge your local changes with the incoming one. It is easy with
> eclipse and SVN client such as Subversive.
> 2. Override and update. It will overwrite your local modification.
> 
> Thanks,
> 
> Raj
> 
> BJ Freeman wrote:
>> showing conflicts for startofbiz.sh and .bat
>> any idea how to resolve this?
>>
>>
>>   
> 
> 
> 
>

Re: Update show conflicts

Posted by Raj Saini <ra...@gmail.com>.

Conflicts happens if you have local changes. You have two choices:

1. Merge your local changes with the incoming one. It is easy with 
eclipse and SVN client such as Subversive.
2. Override and update. It will overwrite your local modification.

Thanks,

Raj

BJ Freeman wrote:
> showing conflicts for startofbiz.sh and .bat
> any idea how to resolve this?
>
>
>