[Slackbuilds-users] Branch naming

[Robby Workman]

On Wed, 26 Sep 2012 12:18:05 +0300
Mikko Värri <vmj at linuxbox.fi> wrote:

> 
> Robby Workman <rworkman at slackbuilds.org> wrote:
> >
> >For future reference, it's much easier for me if you put it in a
> >branch on git://github.com/vmj/slackbuilds.git and I can pull it
> >from there.
> >
> 
> Actually, do you guys prefer that the git branches are always named
> distinctively?


It doesn't really matter, but distinctive names certainly make more
sense, I think.


> This far, I've always named them after PRGNAM, and then deleted the
> branchs when it has been picked to master, and later I've reused the
> name.  Some might say that is equivalent to rebasing a public branch
> (which is a no-no).


A public branch that's rebased is not (in my opinion) a problem at
all UNLESS that branch is intended to be a base on which others 
start development.  In other words, to make a topic branch (e.g.
14.0-bugfixes) that gets rebased to git master, has commits added, 
commits dropped, commits reordered, and so on during its life, is
completely okay, as the branch is going to be deleted once it's 
pulled/merged anyway.  On the other hand, if we were to rebase our
master branch (or any of the versioned branches), that would be 
bad.  It would be rewriting public history that *is* intended as
a development base for others.

-RW
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.slackbuilds.org/pipermail/slackbuilds-users/attachments/20120926/61d27ce5/attachment.asc>