2.合并代码
提测, 准备让测试进行测试时, 需将dev代码合并到test分支 场景, 产品管理的基础属性品牌,类型不显示
1.在master分支修改 2.合并到dev分支 3.从dev 合并到 test分支 4.让测试查看
3.修改uat
在master修改, 合到dev 切换回master, 合到realse
注意, UAT不是推上去就生效, 需要在老头(JK)软件上发布
git checkout -b release origin/release
4.从dev到test冲突
从dev merge代码到test分支. 结果发生了冲突, 现在解决完冲突了, git pull提示: PS D:\www\wwwroot\wf_erp> git status On branch test Your branch is behind 'origin/test' by 20 commits, and can be fast-forwarded. (use "git pull" to update your local branch) All conflicts fixed but you are still merging. (use "git commit" to conclude merge) Changes to be committed: modified: app/xxx.php
Git status
git commit -m "Merge dev into test: resolve conflicts"
git pull
git push
5.很久没从dev->test, 合并发生冲突
- 1.在phpstorm上点击终止合并(没反应就多点几次)
- 2.git pull
- 3.然后继续合并
6.其他项目发现有错
这次是回到master, 修改好后 1.master->realse 2.回到master, master->02->dev->test
