On Fr, 2015-09-11 at 21:57 +0200, Paul Menzel wrote:
Dear SeaBIOS folks,
building SeaBIOS from master, the version string shows 1.8.0-…, which is more current than the rel-1.8.0-148-g75cb2b9 release. This is confusing.
Should the stable branches be merged back into the master branch to get a less confusing behavior? Or is there a different way to handle this?
All patches in stable are cherry-picked from master. So there is nothing to merge.
It's just that stable was branched at rel-1.8.0. stable got, well, stable releases (and tags for them), whereas master didn't got any tags because there is no new release yet ...