[petsc-dev] 'master' RESET after bad merge! - 'tisaac/thplex' was based on 'next'

[Jed Brown]

Satish Balay <balay at mcs.anl.gov> writes:
> I might be misunderstanding things - but I think git branches are nothing but
> tags. This feature enables the current git workflows.

Git branches are "refs" with the added semantic that when HEAD is a
branch, commits advance that ref.  Git "lightweight" tags are refs
without the advancing semantic; annotated tags additionally have a
committer, message, and optional signature.

> On the other hand - mercurial branches are more substantial branches -
> [so perhaps use branch names as distinct items and enforce such
> rules?]  but then one cannot use git workflows here?

Hg branches are a different data model (a label applied to any number of
commits, plus some semantics); bookmarks are similar to git branches.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20140903/8ae0d663/attachment.sig>