goodmeasuresllc / git-woe Goto Github PK

> git-woe
Commands:
  git-woe finish_hotfix   # finish_hotfix to merge the changes back
  git-woe help [COMMAND]  # Describe available commands or one specific command
  git-woe init            # create dual release branches, code and beta
  git-woe major           # both beta and code will be the same at the end of a major release cycle
  git-woe minor           # prepare git to ship code-dev to code and beta-dev to beta
  git-woe start_hotfix    # create a hotfix branch. type close_hotfix

> git woe start_hotfix
git checkout code
Switched to branch 'code'
Your branch is up-to-date with 'origin/code'.
git checkout -b hotfix
Switched to a new branch 'hotfix'
type 'release finish_hotfix' after committing your changes

Switched to branch 'beta-dev'
Your branch is behind 'origin/beta-dev' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
git push
To [email protected]:GoodMeasuresLLC/code.git
 ! [rejected]        HEAD -> beta-dev (non-fast-forward)
error: failed to push some refs to '[email protected]:GoodMeasuresLLC/code.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
FAILED! 1

> git-woe finish_hotfix
git tag hotfix
git tag -a hotfix-2.0 -m 'major release hotfix-2.0: merge from hotfix => hotfix'
git checkout code
Switched to branch 'code'
Your branch is up-to-date with 'origin/code'.
git merge hotfix
warning: refname 'hotfix' is ambiguous.
warning: refname 'hotfix' is ambiguous.
Updating 6bbe25e..6508c78
Fast-forward
 app/assets/javascripts/application.js.erb   |    1 -
 app/assets/javascripts/jstz-1.0.5-custom.js | 1316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/assets/javascripts/jstz.min.js          |    2 -
 3 files changed, 1316 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/jstz-1.0.5-custom.js
 delete mode 100644 app/assets/javascripts/jstz.min.js
git checkout beta
Switched to branch 'beta'
Your branch is up-to-date with 'origin/beta'.
git merge hotfix
warning: refname 'hotfix' is ambiguous.
warning: refname 'hotfix' is ambiguous.
Removing app/assets/javascripts/jstz.min.js
Merge made by the 'recursive' strategy.
 app/assets/javascripts/application.js.erb   |    1 -
 app/assets/javascripts/jstz-1.0.5-custom.js | 1316 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 app/assets/javascripts/jstz.min.js          |    2 -
 3 files changed, 1316 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/jstz-1.0.5-custom.js
 delete mode 100644 app/assets/javascripts/jstz.min.js
git branch -D hotfix
Deleted branch hotfix (was 6508c78).
git tag -d hotfix
Deleted tag 'hotfix' (was 6508c78)
git push --tags
Counting objects: 13, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (13/13), done.
Writing objects: 100% (13/13), 8.09 KiB | 0 bytes/s, done.
Total 13 (delta 7), reused 0 (delta 0)
To [email protected]:GoodMeasuresLLC/code.git
 * [new tag]         hotfix-2.0 -> hotfix-2.0
git checkout code
Switched to branch 'code'
Your branch is ahead of 'origin/code' by 2 commits.
  (use "git push" to publish your local commits)
git push
Total 0 (delta 0), reused 0 (delta 0)
To [email protected]:GoodMeasuresLLC/code.git
   6bbe25e..6508c78  HEAD -> code
git checkout code-dev
Switched to branch 'code-dev'
Your branch is up-to-date with 'origin/code-dev'.
git push
Everything up-to-date
git checkout beta
Switched to branch 'beta'
Your branch is ahead of 'origin/beta' by 8 commits.
  (use "git push" to publish your local commits)
git push
Counting objects: 5, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 547 bytes | 0 bytes/s, done.
Total 5 (delta 3), reused 0 (delta 0)
To [email protected]:GoodMeasuresLLC/code.git
   52e587f..600d63d  HEAD -> beta
git checkout beta-dev
Switched to branch 'beta-dev'
Your branch is behind 'origin/beta-dev' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)
git push
To [email protected]:GoodMeasuresLLC/code.git
 ! [rejected]        HEAD -> beta-dev (non-fast-forward)
error: failed to push some refs to '[email protected]:GoodMeasuresLLC/code.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
FAILED! 1