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 merge back into trunk without any conflicts. Thanks, Tim On 08/03/2011 18:30, "Steve Cohen" <sco...@javactivity.org> 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 but simple question that I find myself unable to give >a simple answer to. I am rephrasing it slightly but it bothers me that >I don't know the simple answer. If I found myself in this situation I >would tweak until it was as desired, but my persnickety colleague is not >satisfied with such answers and for once, I don't blame him. > >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 both change sets are desired to be in the >trunk at the end? >
