与主人合并开发分支 - Merge development branch with master

问题:

I have two branches namely master and development in a GitHub Repository. 我在GitHub存储库中有两个分支,即masterdevelopment 。 I am doing all my development in development branch as shown. 我正在开发分支中进行所有开发,如图所示。

git branch development
git add *
git commit -m "My initial commit message"
git push -u origin development

Now I want to merge all the changes on the development branch into the master . 现在我想将development分支上的所有更改合并到master 。 My current approach is: 我目前的做法是:

git checkout master 
git merge development
git push -u origin master 

Please let me know if the procedure I am following is correct. 如果我遵循的程序是正确的,请告诉我。


解决方案:

参考一: https://stackoom.com/question/xRv3/与主人合并开发分支
参考二: https://oldbug.net/q/xRv3/Merge-development-branch-with-master  来源:锌闻网
上一篇:[Node.js] Mock an API for Local Development in React with Mirage JS


下一篇:vscode plugin development