Steve,
The way we handle this situation, which happens a lot on our svn
repository, is as follows:
When we merge a branch into trunk, if there are other branches which were
originally merged from trunk we next merge trunk into each of the other
branches so that the other branches will be ready to
On Tue, Mar 08, 2011 at 12:30:46PM -0600, Steve Cohen wrote:
> I work with a very senior colleague who has never always resisted
> version control and would much rather do without it, but he is
> forced to go along and I am the whipping boy whenever something goes
> wrong.
>
> He poses a general b
-Original Message-
From: Steve Cohen [mailto:stevec...@comcast.net]
Sent: Tuesday, March 08, 2011 12:20 PM
To: users@subversion.apache.org
Subject: Understanding merging
> I work with a very senior colleague who has never always resisted version
> control and would much rather do witho
On Tuesday 08 March 2011, Steve Cohen wrote:
> Given two branches off a trunk that were taken at different times, if
> the first is merged back to the trunk and then the second, how may the
> second be merged back into the trunk so as not to override changes from
> the first merge, assuming that bo
