---- Andy Levy wrote the following on 05/12/2009 11:43 AM:
> 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
>
>
Sorry, need to clean out the bookmarks. I grabbed one from that wrong
location.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2220564
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-05-12 22:36:34 CEST