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

Re: Subversion problem

From: Andy Levy <andy.levy_at_gmail.com>
Date: Tue, 12 May 2009 14:43:46 -0400

On Tue, May 12, 2009 at 14:31, Richard England
<richard_england_at_mentor.com> wrote:
> Given the limited description, it sounds like someone else has committed
> changes to the element in question and you are not being allowed to
> commit because a merge is necessary.
>
> Take a look at the documentation
> <http://svnbook.red-bean.com/en/1.0/ch03s05.html> and notice that in the
> section titled "Resolve Conflicts (Merging Others' Changes)" you will
> see the error message you are seeing. The resolution is described there,
> as well.

Please don't link to such an ancient version (SVN 1.0) of the manual.
Current version of this chapter:
http://svnbook.red-bean.com/en/1.5/svn.tour.cycle.html#svn.tour.cycle.resolve

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2218930

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-12 20:45:35 CEST

This is an archived mail posted to the Subversion Users mailing list.