pplog@pplog ~ $ brew update
error: The following untracked working tree files would be overwritten by merge:
Library/Formula/autojump.rb
Please move or remove them before you can merge.
Updating f6442dc..4d66bf8
Aborting
Error: Failed while executing git pull origin refs/heads/master:refs/remotes/origin/master
$ brew install git-flow
==> Cloning https://github.com/nvie/gitflow.git
Cloning into /Users/pplog/Library/Caches/Homebrew/git-flow--git...
remote: Counting objects: 324, done.
remote: Compressing objects: 100% (244/244), done.
remote: Total 324 (delta 100), reused 233 (delta 42)
Receiving objects: 100% (324/324), 225.48 KiB | 160 KiB/s, done.
Resolving deltas: 100% (100/100), done.
==> Checking out tag 0.4.1
Submodule 'shFlags' (git://github.com/nvie/shFlags.git) registered for path 'shFlags'
Cloning into shFlags...
remote: Counting objects: 454, done.
remote: Compressing objects: 100% (55/55), done.
remote: Total 454 (delta 389), reused 454 (delta 389)
Receiving objects: 100% (454/454), 101.30 KiB | 99 KiB/s, done.
Resolving deltas: 100% (389/389), done.
Submodule path 'shFlags': checked out '2fb06af13de884e9680f14a00c82e52a67c867f1'
==> make prefix=/usr/local/Cellar/git-flow/0.4.1 install
==> Cloning https://github.com/bobthecow/git-flow-completion.git
Cloning into /Users/pplog/Library/Caches/Homebrew/git-flow-completion--git...
remote: Counting objects: 63, done.
remote: Compressing objects: 100% (53/53), done.
remote: Total 63 (delta 22), reused 39 (delta 10)
Unpacking objects: 100% (63/63), done.
==> Checking out tag 0.4.1.0
/usr/local/Cellar/git-flow/0.4.1: 13 files, 132K, built in 11 seconds
初期化
$ git flow init
Which branch should be used for bringing forth production releases?
- master
Branch name for production releases: [master]
Branch name for "next release" development: [develop]
How to name your supporting branch prefixes?
Feature branches? [feature/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []
ブランチきる
$ git flow feature start modify-layout-css(ブランチ名)
Branches 'develop' and 'origin/develop' have diverged.
And local branch 'develop' is ahead of 'origin/develop'.
Switched to a new branch 'feature/modify-layout-css'