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

RE: [Subclipse-users] Merge lost revisions

From: Bruno Velly <bruno.velly_at_freesbee.fr>
Date: Fri, 22 Apr 2011 11:13:52 -0700 (PDT)

Hello, and thank you for trying to help me!

The problem, in that case, is that there is no tree conflict (see attached file).

B. Velly

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].

merge_result.jpg
Received on 2011-04-22 20:13:54 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.