# HG changeset patch # User Eli Zaretskii # Date 1274168315 -10800 # Node ID c8d754c15c558e67f6ca21c3f40ef046c1ba3ede # Parent 0b7cdd98b42f01ddd9221e3900be10e8662f11cf Advise against unnecessary merges from trunk to feature branches. diff -r 0b7cdd98b42f -r c8d754c15c55 admin/notes/bzr --- a/admin/notes/bzr Mon May 17 20:03:14 2010 -0700 +++ b/admin/notes/bzr Tue May 18 10:38:35 2010 +0300 @@ -26,6 +26,14 @@ preferred that you take your branch's diff, apply it to the trunk, and commit directly, not merge. This keeps the history cleaner. +In general, when working on some feature in a separate branch, it is +preferable not to merge from trunk until you are done with the +feature. Unless you really need some change that was done on the +trunk while you were developing on the branch, you don't really need +those merges; just merge once, when you are done with the feature, and +Bazaar will take care of the rest. Bazaar is much better in this than +CVS, so interim merges are unnecessary. + Or use shelves; or rebase; or do something else. See the thread for yet another fun excursion into the exciting world of version control.