Github 共同開発ブランチなど
＜ブランチ＞
つくる
名前： アカウント名/作業名
コメントをもらう
まーじ
けす
git branch -d (ここに名前かく---
ーーーーーーーーーーーーメモーーーーーーーーー
ikefure git:(HOkn/admin-form) git config --global credential.helper osxkeychain
➜ ikefure git:(HOkn/admin-form) git push origin HOkn/admin-form
Username for 'https://github.com': HOkn
Password for 'https://HOkn@github.com':
Everything up-to-date
➜ ikefure git:(HOkn/admin-form) git push origin HOkn/admin-form
Everything up-to-date
➜ ikefure git:(HOkn/admin-form) git credential-osxkeychain
usage: git credential-osxkeychain <get|store|erase>
➜ ikefure git:(HOkn/admin-form) git credential-osxkeychain get
^C
➜ ikefure git:(HOkn/admin-form) git checkout harudev
Switched to branch 'harudev'
➜ ikefure git:(harudev) git merge HOkn/admin-form
Updating 4036bac..1c2da7a
Fast-forward
config/routes.rb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
➜ ikefure git:(harudev) git push origin harudev
Total 0 (delta 0), reused 0 (delta 0)
To https://github.com/HOkn/ikefure.git
4036bac..1c2da7a harudev -> harudev
➜ ikefure git:(harudev) git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
➜ ikefure git:(master) git pull origin master
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 6 (delta 5), reused 6 (delta 5), pack-reused 0
Unpacking objects: 100% (6/6), done.
From https://github.com/HOkn/ikefure
* branch master -> FETCH_HEAD
629870e..be8cc9c master -> origin/master
Updating 629870e..be8cc9c
Fast-forward
app/controllers/faces_controller.rb | 7 ++++++-
app/views/admin.html.erb | 19 -------------------
app/views/faces/admin.html.erb | 17 +++++++++++++++++
config/routes.rb | 6 +++++-
4 files changed, 28 insertions(+), 21 deletions(-)
delete mode 100644 app/views/admin.html.erb
create mode 100644 app/views/faces/admin.html.erb
➜ ikefure git:(master) git branch -d HOkn/admin-form
Deleted branch HOkn/admin-form (was 1c2da7a).
➜ ikefure git:(master) git branch -d harudev
Deleted branch harudev (was 1c2da7a).
