Hi,
I'm facing a problem where I get items modified by a merge although
there should be nothing to merge at all.
I create a new branch from trunk.
I checkout from that new branch.
I merge from trunk into the new branch.
[ No intermediate commit did happen as I'm doing this on a personal
backup c
Am Dienstag, den 07.06.2011, 08:13 -0500 schrieb Les Mikesell:
> Yes, I have a hard time visualizing how any tool can help with
> concurrent changes if one side doesn't stop while the merges happen
> both ways and the results get back.
Just look at Clearcase (again, sorry :) ). First, it has exce
Am Montag, den 06.06.2011, 07:52 -0500 schrieb Les Mikesell:
> If you are doing this in 2 directions, won't the disconnected
> repositories eventually drift out of sync as the people resolving
> conflicts make different choices - regardless of how well the VCS
> manages the details?
I guess you'r
Am Montag, den 06.06.2011, 11:55 +0200 schrieb Andreas Tscharner:
> > I am looking for suggestions from the community as to how
> > best address the setup issue outlined below.
> >
> > We have two sites wanting to use Subversion that are
> > performing parallel development of the same software. Du
