Menu
▾
▴
Re: [Rails-devel] Branch names in repo: cleanup?
|
From: Stefan F. <ste...@we...> - 2014-03-09 17:53:42
|
<html>
<head>
</head>
<body>Thanks for this and all the 1880 save games.<br>
I will add those to the automated tests.<br>
Stefan <br>
<br><br><div class="gmail_quote">Martin Brumm <dr....@t-...> wrote:<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
Hi Stefan et al.<br/>
<br/>
Actions Taken,<br/>
<br/>
rails1.7.12_1880-> rails1.8.x<br/>
rails_2_develop_1880->mbr_rails_2_develop_1880<br/>
specific_1824->mbr_specific_1824<br/>
specific_1837->mbr_specific_1837<br/>
specific_1880->mbr_specific_1880<br/>
<br/>
<br/>
Regards,<br/>
Martin<br/>
<br/>
Am 08.03.2014 13:35, schrieb Stefan Frey:<br/>
> I would like to clean up the names of the branches in the repo a little<br/>
> bit. I believe it is important to know, who is the owner of a (shared)<br/>
> feature branch and which are the official branches.<br/>
><br/>
> The remote branches are:<br/>
><br/>
> * 2.0 (prefix with owner)<br/>
> * 2.0_develop (prefix with owner)<br/>
><br/>
> master (keep, 1.x master branch)<br/>
> rails1.5.x (remove)<br/>
> rails1.6.x (remove)<br/>
> rails1.7.12_1880 (rename to rails1.8.x?)<br/>
> rails1.7.x (keep as official)<br/>
><br/>
> rails_2_develop (keep as official)<br/>
> * rails_2_develop_1880 (prefix with owner martin)<br/>
><br/>
> sfy_1880 (keep as mine current 1880 branch)<br/>
> sfy_token_algo (keep as mine current token/tile algo branch)<br/>
><br/>
> * specific_1824 (prefix with owner)<br/>
> * specific_1830_2nd (prefix with owner)<br/>
> * specific_1837 (prefix with owner)<br/>
> * specific_1880 (prefix with owner)<br/>
><br/>
> All with a star (*) above need some action from the owner to prefix with<br/>
> a good and short owner abbreviation (mine is sfy).<br/>
><br/>
> It should still be the case that we merge changes with the main branches<br/>
> (either rails1.8.x or rails_2_develop) early to avoid diverging branches<br/>
> for specific games.<br/>
><br/>
> Stefan<br/>
><br/>
> ***<br/>
> A good explanation to rename a git branch both locally and remote is<br/>
> given here:<br/>
><br/>
><a href="http://www.benjaminlhaas.com/blog/locally-and-remotely-renaming-branch-git" target="_blank"> http://www.benjaminlhaas.com/blog/locally-and-remotely-renaming-branch-git</a><br/>
><br/>
> In short:<br/>
> 1. rename locally,<br/>
> 2. delete the remote one with the old name<br/>
> 3. create a remote one with the new name.<br/>
><br/>
> ------------------------------------------------------------------------------<br/>
> Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.<br/>
> With Perforce, you get hassle-free workflows. Merge that actually works.<br/>
> Faster operations. Version large binaries. Built-in WAN optimization and the<br/>
> freedom to use Git, Perforce or both. Make the move to Perforce.<br/>
><a href="http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk" target="_blank"> http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk</a><br/>
> _______________________________________________<br/>
> Rails-devel mailing list<br/>
> Rai...@li...<br/>
><a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank"> https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/>
<br/>
<br/>
------------------------------------------------------------------------------<br/>
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.<br/>
With Perforce, you get hassle-free workflows. Merge that actually works.<br/>
Faster operations. Version large binaries. Built-in WAN optimization and the<br/>
freedom to use Git, Perforce or both. Make the move to Perforce.<br/>
<a href="http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk_______________________________________________" target="_blank">http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk_______________________________________________</a><br/>
Rails-devel mailing list<br/>
Rai...@li...<br/>
<a href="https://lists.sourceforge.net/lists/listinfo/rails-devel" target="_blank">https://lists.sourceforge.net/lists/listinfo/rails-devel</a><br/>
</blockquote></div></body>
</html>
|
