Git merges local code to branch

Local code merge to Dev branch

Submit in local branch
git Add.
Git commit-m "Playbuy"

Switch to Dev Branch
git checkout Dev
Git pull
Merging branches
Git merge local (dev merge to the HF branch, the need to add-noff parameters, is to prevent first to merge the policy, do not need the next step git rebase, because Dev and HF belong to the online version, need to preserve the empty merge version to know the merged node, The local does not need to be retained )

git rebase removing the merge empty version
Git push Origin Dev

The above is just my use of

The detailed article has the http://blog.csdn.net/hudashi/article/details/7668798, the first to wait to have the free to study under

Git merges local code to branch