Re: Problem with merging
From: Thorsten Schöning <tschoening_at_am-soft.de>
Date: Wed, 12 Sep 2012 20:38:31 +0200
Guten Tag John Maher,
> I started using subversion a while back and doing a merge I lost a bunch
Unless you didn't commit, you can't loose source code, that's what
> I now have a stable code base and wish to use subversion so I tried to
If you mean your later mentioned conflicts with "failed", this isn't
> 1) I was on revision 4. I then branced it, made a change and it
Yes, revisions are global, that's one of the fundamental concepts of
Mit freundlichen Grüßen,
Thorsten Schöning
-- Thorsten Schöning E-Mail:Thorsten.Schoening_at_AM-SoFT.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon.............030-2 1001-310 Fax...............05151- 9468- 88 Mobil..............0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas MuchowReceived on 2012-09-12 20:39:07 CEST |
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.