[petsc-dev] branches in the git repository

[Jed Brown]

Barry Smith <bsmith at mcs.anl.gov> writes:

>    We need a way to organize the “intent” of branches in the
>    repository. Are they throw away tests, long term projects, simple
>    fixes meant to go into next/master soon ….

Usually I either refrain from pushing throw-away stuff or totally
incomplete stuff (though sometimes I just name that 'jed/wip-xyz').

>    Now aside from the names how do we know the intent and history? I’m
>    finding branches of mine that should have been merged into next
>    months ago and are now so far behind they need to be discarded
>    since they cannot be merged.

You should still be able to rebase them.

>  Plus how come no mater how many times and ways I try to delete
>  origin/barry/fix-get-create I cannot get rid of it?

If you want to delete a branch on the server, use

$ git push origin :barry/fix-get-create
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131209/4e1b78b1/attachment.sig>