如何推入我的分支并从git大师那里拉

Question

执行以下顺序是否合适：

git add [file names]
git commit [comments]
git checkout master
git pull
git checkout [my branch]
git merge master
git push

Answer 1

如何能够推送到不同的分支名称？

您快到了，但是您错过了一些重要的步骤：

# Add the desired files to stage area
git add [file names]

# commit the changes
git commit [comments]

# switch to master branch
git checkout master

# git pull
# This is dangerous !!! if you are using git version <2.0

在这里阅读原因（第一段）。

---

如何以简单的方式做到这一点：

# Commit changes to your local branch 

# pull changes from the remote branch to your branch
# since you are already on your branch - you dont need to switch 
# to master branch. Simply grab the remote copy and merge it into
# your local branch using the pull command.
git pull origin master

# now your changes are merged with master
git push origin <branch_name>