Branches or Bookmarks

[Matt Mackall]

On Wed, 2015-08-19 at 10:17 -0700, Stephen Rasku wrote:
> I have a repository for my development environment.  Part of this is the
> copyright template which is different for each company I work for.  I was
> planning on creating a branch and any generic changes would go in the
> default branch and the yearly copyright changes would go in the company
> branch.  I would merge the generic changes to the company branches as they
> were made.
> 
> However, when I created the branch it asked if I wanted to create a
> bookmark instead.  Do I?

Do you care if your name is permanent? It sounds like you intend it to
be. Use a branch. That warning 

>   Would it make more sense?  The development
> environment is on Bitbucket and I would like to avoid pushing proprietary
> changes there if at all possible.  It seems it would be easy to do by
> accident if I am on the proprietary branch all the time.

Push will complain if you try to push a branch that isn't yet present on
the server and will force you to either a) push -r thepublicstuff or b)
push -f (oops!).

-- 
Mathematics is the supreme nostalgia of our time.