如何将文件从本地分支推送到远程分支

Question

1. I have a local branch name mydev and remote branch name mydev
2. I made change to a file and commit this file to my local branch mydev How do I push this file from my local branch mydev to my remote branch mydev and also update the master branch? Thanks

Answer 1

First push to 'mydev' branch. Then switch to 'master' branch and marge 'master' with 'mydev'. Now push to remote master.

git push origin mydev
git checkout master
git merge --no-ff mydev
git push origin master

Here is a great article on Git branching model.