Merging Multiple Mercurial Branches Together -


i have bunch of developers bug fixes using branches. need: what's best way automate (or there way) merging of these branches 1 main branch, "default".

thanks

note: opinion, there can multiple opinions here, @ least understand point here , decide want different.

first of all, there missing here, , think generate workflow problems in long run.

merging not should skipped, or delegated other people, developers work in branches should merge themselves. they, , only they, know did, , how resolve merge conflicts.

in way, doing automatic, that's not going work.

here's workflow developers should use (in opinion.)

periodically, instance every morning, developers on branch should check build server ensure default branch builds. if (and should!), merge from default branch down own.

this has 3 major benefits:

  1. they have latest code in own branch, , don't bogged down working around known bugs have been fixed in branch
  2. they deal merge conflicts other branches constantly, while conflicts small, , changes still fresh in minds of developers did them.
  3. since deal merge conflicts every day (provided there any), when end of life of branch, merged default branch anyway, work involved in merging default should cheap, if not free.

at point they're read integrate work default branch (either periodically, ie. partial releases of new features, or @ end, done), , yet merge from default own branch. ensures lingering merge conflicts handled team, in branch, before release rest of developers.

when have dealt merge conflicts due merge, can merge other direction, branch default. @ point, unless has managed merge/push conflicting changes default in meantime, there no merge conflicts @ all.

doing way ensures that:

  1. the developers merges training in merging
  2. the developers did changes still have changes fresh in memory
  3. you amortize work involved merge conflicts doing them often, , doing them in small portions.
  4. you don't big merge-"week" @ end of project, when has forgotten changes, why done , did them

if of unclear, please leave comment , i'll update/edit accordingly.


Comments

Post a Comment