[petsc-dev] branches in the git repository

[Matthew Knepley]

On Tue, Dec 10, 2013 at 12:07 AM, Jed Brown <jedbrown at mcs.anl.gov> wrote:

> 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').


I think the names work if we are consistent. I am using 'fix', 'feature',
'remove'.


> >    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.


Or just merge in master.


> >  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
>

Someone needs to hang for this one.

   Matt

-- 
What most experimenters take for granted before they begin their
experiments is infinitely more interesting than any results to which their
experiments lead.
-- Norbert Wiener
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131210/9aefdd63/attachment.html>