[Development] Branches and time based releases

[Thiago Macieira]

Em seg 24 fev 2014, às 21:11:47, Knoll Lars escreveu:
> * Since the 5.x.y branches then only contain a very small (ideally 0) set
> of changes that have been cherry-picked from 5.x, we can safely close that
> branch after the release is out. Yes, this implies that there’s no
> fast-forward from one release to the next, but I seriously doubt this
> would cause problems for anybody in practice.

git merge -s ours solves the fast-forwarding issue. And that's if the git 
merge without -s ours doesn't already do the right thing.

If the number of changes tends to 0, then I see no reason to merge back. We'll 
have a handful of duplicated commits (tending to 0) in the repository, but so 
what? That's better than the hapless user who's tracking a tag getting 
confused by a merge when they do "git pull".
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center