Loading ...
Sorry, an error occurred while loading the content.
 

Merging Branched Development

Expand Messages
  • Andy Glew
    What s the XP way to handle the mefing of branched development? Situation: Development *has* branched, yielding separate, albeit related, codebases. (Let s not
    Message 1 of 1 , May 3, 2000
      What's the XP way to handle the mefing of branched development?

      Situation:

      Development *has* branched, yielding separate, albeit related,
      codebases.

      (Let's not talk about whether it should have branched or not.
      Or maybe we should: when is branching development okay
      in XP? Geographic isolation? An experiment that you want to
      perform without adding risk to your main codebase?)

      The branch has some useful bugfixes and enhancements.
      It also, however, has some features that are absolute garbage.
      They don't break the code, but just add clutter,
      and will never be used.

      CVS merge via update -j works - no CVS conflicts.
      The merge builds.

      But, unfortunately, some of the changes that need to be
      kept and thrown out are mixed up in the same files.

      What's the XP way:

      (A) attempt to disentangle the changes, and apply the useful
      changes one by one?

      (B) merge it all - it doesn't break anything - and now go and
      try to remove the unnecessary clutter.
    Your message has been successfully submitted and would be delivered to recipients shortly.