-
-
Save nelix/750765 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
-Go to the starting point of the project | |
>> git checkout origin master | |
-Create and checkout your branch | |
>> git checkout -b [branch] | |
-Make changes | |
>> git commit -a -m"commit messages" | |
-Push the changes to the remote if you want review, so on | |
>> git push origin [branch] | |
-Go back to the branch you want to merge to | |
>> git checkout master | |
>> git merge [branch] | |
-Resolve conflicts | |
>> git push origin master | |
ex. | |
git checkout origin master | |
git checkout -b release_a | |
-make changes | |
git commit -a -m"changed config" | |
git checkout master | |
git merge release_a | |
git push origin master | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment