[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[sup-devel] branching and merging



Hello

I'm wondering if there are preferred strategies for the feature branches. 
I'm aware that new branches should be branched off master, and merged into
next when the author thinks they're ready. But I'm wondering when a merge has 
been done from a branch, should development continue on that branch?

I've been working on the gpgme branch, even though a number of the earlier 
commits on that branch have been merged into master. So I've been using git
cherry-pick to merge later commits into next. Is that a reasonable way to go
or should I be starting lots of little branches, or merging into next less
often? Or does it just not make much difference to the maintainers and I 
should do what works for me?

Any opinions?

Hamish
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel