Revert "feat: 解决冲突"
This reverts commit 07c077a8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
Please
register
or
sign in
to comment
This reverts commit 07c077a8
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b revert-07c077a8 origin/revert-07c077a8
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout test git merge --no-ff revert-07c077a8
Step 4. Push the result of the merge to GitLab
git push origin test
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.