[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: Re: Re: Re: [Subclipse-dev] compile and install subclipse using local update site

From: elane pereira <elane.s.pereira_at_gmail.com>
Date: Thu, 29 Apr 2010 08:29:52 -0700 (PDT)

> ... You need to
> develop a script that can automate the merge and get it working to
> your satisfaction and then decide how to automate it.

Ok As I understand the script should be done to make the merge and then commit the diff. But in the case of conflict, the developer will have to address manually, I can describe it also in the script? I thought it was specific of subversion.

Lanne

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1043&dsMessageId=2598959

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_subclipse.tigris.org].
Received on 2010-04-29 17:29:54 CEST

This is an archived mail posted to the Subclipse Dev mailing list.