git checkout -b hotfix
表示从当前分支拉出一个新分支hotfixgit checkout -b hotfix dev
表示从dev分化出一个新分支hotfix,不管当前在什么分支git checkout -b hotfix master
表示从master 分化出一个新分支hotfix, 不管当前
github 的命令行合并
Step 1: From your project repository, check out a new branch and test the changes.
git checkout -b yourname-dev dev #表示从dev分支分化拉出出yourname-dev
git pull https://github.com/yourname/SpinalHDL.git dev #并且将远程仓库的dev 分支拉去到当前yourname-dev 分支
Step 2: Merge the changes and update on GitHub.
git checkout dev #checkout dev
git merge --no-ff yourname-dev #合并这个分支
git push origin dev #push 到origin , 也可以push到其他remote