Git工作流程:
已有:master分支,develop分支
开发流程:
1.基于develop分支创建自己的分支:
git checkout develop
git branch -b new_branch
2.在本地的分支做了一些修改后,提交到new_branch
git add a.txt
git commit -m “ADD:msg”
Git push origin new_branch
3.准备提交pr到develop
git checkou develop
git pull
git checkout new_branch
git rebase develop (如果有冲突解决冲突)
4.解决冲突后,重新提交到new_branch
git add a.txt
git commit -m “MOD:resolve conflict”
Git push origin new_branch
5.在github上提交pull request,从new_branch到develop,选择rebase and merge
github工作流程
最新推荐文章于 2024-07-31 23:01:59 发布