• This project
    • Loading...
  • Sign in

teaching-service / teaching-service-wiki

Go to a project
Toggle navigation Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 2
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
Open
Merge Request !1 opened 2017-10-31 11:34:41 UTC by jiaozijun@jiaozijun

Update 短信模板.md

Check out branch Download as
  • Email Patches
  • Plain Diff
Request to merge jiaozijun:patch-2 into master (7 commits behind)
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://gitlab.boxfish.cn/jiaozijun/teaching-service-wiki.git patch-2
git checkout -b jiaozijun/teaching-service-wiki-patch-2 FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff jiaozijun/teaching-service-wiki-patch-2

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

This merge request contains merge conflicts

Please resolve these conflicts or ask someone with write access to this repository to merge this request manually.

  • Discussion 0
  • Commits 1
  • Changes 1
  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: teaching-service/teaching-service-wiki!1