Solved a problem about merge confilct in git

git checkout develop
git merge –no-ff feature/CHE-8800
if still confilct
solve it and add it to version controller
commit it
try again git merge –no-ff feature/CHE-8800
git push origin develop

发表评论

电子邮件地址不会被公开。 必填项已用*标注

此站点使用Akismet来减少垃圾评论。了解我们如何处理您的评论数据