You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@usergrid.apache.org by Todd Nine <to...@gmail.com> on 2015/09/25 02:39:01 UTC

Branch rename starting

Hey all,
  I'm starting the master rename.  I'll update once complete.

Re: Branch rename starting

Posted by Todd Nine <to...@gmail.com>.
All done.  Here is a summary for those interested.

*Renaming*

source -> target

master -> 1.x
two-dot-o-dev -> master


*Notes*

Note that I couldn't just delete the remote "master" branch due to ASF git
restrictions.  Below are the steps I've taken to accomplish the rename.


#Rename master -> 1.x
git fetch origin
git checkout master
git checkout -b 1.x
<commit and revert to force github sync>
git push origin 1.x

#Rename two-dot-o-dev -> master
git fetch origin
git checkout two-dot-o-dev
git merge -s ours origin/master
git checkout master
git merge two-dot-o-dev
git push


Note that to force a sync with github so it's available to our most visible
repo, I also had to add then reverse the add commit of a text file to force
ASF git to sync to github.

If you have any questions, please let me know.

Todd



On Thu, 24 Sep 2015 at 18:39 Todd Nine <to...@gmail.com> wrote:

> Hey all,
>   I'm starting the master rename.  I'll update once complete.
>