假如现在在dev分支,首先查看分支
git branch
修改完代码,提交到dev分支
git add .
git commit -m '代码修改'
git push origin dev
切换至main分支
git checkout main
然后拉取
git pull origin main
将dev分支合并至main
git merge dev
查看分支状态
git status
推送到远程main
git push origin main
git branch
git add .
git commit -m '代码修改'
git push origin dev
git checkout main
git pull origin main
git merge dev
git status
git push origin main