[Rails-devel] Branch names in repo: cleanup?

[Stefan F. <ste...@we...>]

I would like to clean up the names of the branches in the repo a little 
bit. I believe it is important to know, who is the owner of a (shared) 
feature branch and which are the official branches.

The remote branches are:

* 2.0 (prefix with owner)
* 2.0_develop (prefix with owner)

master (keep, 1.x master branch)
rails1.5.x (remove)
rails1.6.x (remove)
rails1.7.12_1880 (rename to rails1.8.x?)
rails1.7.x (keep as official)

rails_2_develop (keep as official)
* rails_2_develop_1880 (prefix with owner martin)

sfy_1880 (keep as mine current 1880 branch)
sfy_token_algo (keep as mine current token/tile algo branch)

* specific_1824 (prefix with owner)
* specific_1830_2nd (prefix with owner)
* specific_1837 (prefix with owner)
* specific_1880 (prefix with owner)

All with a star (*) above need some action from the owner to prefix with 
a good and short owner abbreviation (mine is sfy).

It should still be the case that we merge changes with the main branches 
(either rails1.8.x or rails_2_develop) early to avoid diverging branches 
for specific games.

Stefan

***
A good explanation to rename a git branch both locally and remote is 
given here:

http://www.benjaminlhaas.com/blog/locally-and-remotely-renaming-branch-git

In short:
1. rename locally,
2. delete the remote one with the old name
3. create a remote one with the new name.