新手：git回滚代码，合并代码解决冲突

回滚到某个tag：

git reset --hard 70438034dc

git push -f

 

合并---解决冲突---提交：

Step 1. Fetch and check out the branch for this merge request
git fetch origin
git checkout -b "feature-cacheAuth" "origin/feature-cacheAuth"

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up
git fetch origin
git checkout "origin/develop"
git merge --no-ff "feature-cacheAuth"

Step 4. Push the result of the merge to GitLab
git push origin "develop"