[
https://issues.apache.org/jira/browse/CURATOR-406?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15993647#comment-15993647
]
Scott Blum edited comment on CURATOR-406 at 5/2/17 8:15 PM:
------------------------------------------------------------
What I did. (Note, my Apache remote is named "apache" in my repo, not "origin")
- git remote update # to be sure I had everything current locally
- git checkout master; git merge # checkout and update master
- git branch CURATOR-2.0 # mark the old master branch
- git checkout CURATOR-3.0; git merge # checkout and update 3.0
- git merge master -m "CURATOR-3.0 becomes the master branch."
- inspect / test the result
- git push apache HEAD:CURATOR-3.0 # fast forward
- git push apache HEAD:master # fast forward
- git push apache CURATOR-2.0:CURATOR-2.0 # new branch
was (Author: dragonsinth):
What I did. (Note, my Apache remote is named "apache" in my repo, not "origin")
- git remote update # to be sure I had everything current locally
- git checkout master; git merge # update master to remote
- git branch CURATOR-2.0 # mark the old master branch
- git checkout CURATOR-3.0; git merge
- git merge master -m "CURATOR-3.0 becomes the master branch."
- inspect / test the result
- git push apache HEAD:CURATOR-3.0 # fast forward
- git push apache HEAD:master # fast forward
- git push apache CURATOR-2.0:CURATOR-2.0 # new branch
> The CURATOR-3.0 branch should become master
> -------------------------------------------
>
> Key: CURATOR-406
> URL: https://issues.apache.org/jira/browse/CURATOR-406
> Project: Apache Curator
> Issue Type: Task
> Components: General
> Affects Versions: 3.3.0, 2.12.0
> Reporter: Jordan Zimmerman
> Assignee: Scott Blum
>
> Currently, we have two main git branches, {{master}} (corresponding to
> Curator 2.x) and {{CURATOR\-3.0}}. {{master}} should become {{master\-2.0}}
> and {{CURATOR\-3.0}} should become {{master}}.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
