Last active
August 29, 2015 14:15
-
-
Save marushu/e6726b0f1d10c52c5dec to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ git pull origin master ← リモートリポジトリと同期 | |
$ git checkout -b DEV_BRANCH master ← 開発ブランチを作成 ///// masterだよ ///////// | |
--- ソースの修正 --- | |
$ git add -u | |
$ git commit -m "修正内容" | |
$ git push origin DEV_BRANCH ← リモートリポジトリの開発ブランチに push | |
$ git checkout master | |
$ git pull origin master ← 変更を取り込み(他の人が master に push してるかもなので ) | |
$ git merge DEV_BRANCH ← 開発ブランチをマージ | |
$ git push origin master | |
もちろん、staging と merge するときも merge 前に git pull origin staging ね。 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment