e to the errors reported
earlier.
We merged the changes according to the description given here:
http://blog.red-bean.com/sussman/?p=92
Michael
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Montag, 6. September 2010 14:27
To: Ungruhe, Michael
Cc: users@subversion.apach
the users itself are still different, but they use
the same account.
-Original Message-
From: Stefan Sperling [mailto:s...@elego.de]
Sent: Freitag, 3. September 2010 11:08
To: Ungruhe, Michael
Cc: users@subversion.apache.org; Strucken, Andreas
Subject: Re: Merge problem with different use
Hi,
We noticed the following problem:
We are usually working on the trunk, but for a change request we created a
branch. Development continued on both, the trunk and the branch.
Some changes were made on the trunk including the deletion of some files, all
changes were committed to the t
