Regarding bugfixes and branches and merging

[Niko Sams]

On Tue, May 18, 2010 at 21:14, Andreas Pakulat <apaku at gmx.de> wrote:
> Hi,
>
> ok, after about 1.5 weeks its pretty obvious that everybody wants his
> fixes asap in master and at the same time nobody wants to spend time on
> merging other people's fixes into master (which I totally understand).
>
> Hence I hereby suggest that everybody who has a bugfix to commit thats
> applicable to 1.0 commits it to the 1.0 branch and then does:
> git checkout master
> git merge 1.0
> git push origin master 1.0
hmm... I don't know.
that would cause lots of merge commits and that's not the best for
master history.

If we go the immideately-merge-every-commit route, cherry-picking into
1.0 would be a better choice imho.

But I still like the current state of not having to care about merging.

Niko