Skip to content

Instantly share code, notes, and snippets.

@uupaa uupaa/github-flow-memo.md
Last active Mar 14, 2018

Embed
What would you like to do?
GitHub flow memo

GitHub Flow

http://www.atmarkit.co.jp/ait/articles/1401/21/news042.html

feature ブランチ作成

git checkout -b {{new-feat}}
git push origin {{new-feat}}

push

git push

push すると、GitHub上でプルリクエストが作成される

masterへマージ

GitHubのGUIを使わずに手動でやる場合はこちら。基本的にはこれはやらなくても良い

git checkout master
git merge --no-ff {{new-feat}}

master の変更を取り込む

乖離が進むと master へのマージ作業が辛いので、こまめに master の変更を new-feat に取り込む

git checkout {{new-feat}}
git merge master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.