Don't know if this will help you or not, but I ran into some problems
(still am) learning subversion. I can tell you what I learned.
Someone told me that conflicts are normal, and when I looked deeper,
they are 100% correct. The merge doesn't work perfect all the time. It
depends on your changes.
For example, I deleted a function and created a new one in its place.
During a merge this caused a conflict. There was different code in the
same place in the source and the target. Which to keep? This SHOULD
cause a conflict so a human can look and choose the right one. That is
why they say merge often, less changes means less chance for a conflict.
But conflicts will occur.
One way to fix things is to make a new repository. You lose all your
history so it would depend on how long you've been using subversion and
how important your history is vs how bad your current repository is. A
new repository will start you with a clean slate and you keep the old
one for the history. You then need to be more careful.
Another way to fix things is to manually fix all the conflicts.
Subversion does a lot of things and some of them are not so straight
forward. But it is also very powerful. Very easy to shoot yourself in
the foot.
John
-----Original Message-----
From: Stefan Sperling [mailto:stsp_at_elego.de]
Sent: Wednesday, September 19, 2012 4:34 AM
To: David Aldrich
Cc: users_at_subversion.apache.org
Subject: Re: Merging headache
On Wed, Sep 19, 2012 at 08:19:59AM +0000, David Aldrich wrote:
> As this is rather a mess, can you suggest a way to get back to some
degree of order?
I'm afraid I cannot make any reasonable suggestion at this point, sorry.
I'd need more information about what really happened.
Received on 2012-09-19 14:58:05 CEST