Line 31: | Line 31: | ||
git merge <branchname> | git merge <branchname> | ||
+ | |||
+ | <div class="fb-like" data-layout="standard" data-action="like" data-show-faces="false" data-share="true"></div> | ||
+ | |||
+ | |||
+ | <div class="fb-share-button" data-type="button_count"></div> | ||
+ | |||
+ | </disqus> | ||
[[Category:Technical]] | [[Category:Technical]] |
git init
git remote add <name> <url>
git pull <name> serverbranch:localbranch
git add <filename>
git commit -m "<commit message>"
git push <name> localbranch:serverbranch
git checkout <branchname>
git checkout -b <branchname>
git branch
git merge <branchname>
</disqus>
git init
git remote add <name> <url>
git pull <name> serverbranch:localbranch
git add <filename>
git commit -m "<commit message>"
git push <name> localbranch:serverbranch
git checkout <branchname>
git checkout -b <branchname>
git branch
git merge <branchname>