safe merge strategies: i am learning about merging in git, and there are 2 good practices that can help you (if you are also new dev as me) to minimize the chances of messing up with your git...
在git合并时,新手可以通过两种策略减少错误:一是创建测试合并分支,模拟主分支进行合并和测试;二是在个人工作分支中创建测试分支,合并其他分支验证代码。若需撤销合并,可将主分支重置为远程状态。