replace default branch by named branch?
Jürgen Link
juergen.link at googlemail.com
Mon Oct 4 11:29:48 UTC 2010
Am 04.10.2010 13:00, schrieb Mads Kiilerich:
>
> Why do merging seem error-prone? I assume that your future development
> should be based on everything in the 2.1 release branch anyway?
Exactly: we want to base our further development on the head of
release-2.1 branch. Merging with an outdated default branch might bring
back some stuff we already expunged (e.g. deleted files).
>
> You might however want to merge from your release branches and down to
> a main-line (default?), and then merge from the main-line to your
> development branch(es).
To be honest, I prefer having no release branches at all. Development
should be done on default branch as much as possible. This branch was a
complete accident.
Cheers
Jürgen
More information about the Mercurial
mailing list