订单静态页面
合并冲突
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
合并冲突
Step 1. Fetch and check out the branch for this merge request
git fetch https://gitlab.shushangyun.com/linweijiong/gaohuaxue-mobile-app.git v2-test git checkout -b linweijiong/gaohuaxue-mobile-app-v2-test FETCH_HEAD
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git checkout v2-test git merge --no-ff linweijiong/gaohuaxue-mobile-app-v2-test
Step 4. Push the result of the merge to GitLab
git push origin v2-test
Note that pushing to GitLab requires write access to this repository.
Tip: You can also checkout merge requests locally by following these guidelines.
closed
·closed