• This project
    • Loading...
  • Sign in

fangyeqing / xkl-interface · Merge Requests

Go to a project

GitLab

  • Go to dashboard
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
Merged
Merge Request !2 opened 2016-11-27 15:09:43 UTC byzhaoyue@zhaoyue

UpSoft features Merge

账号相关。登录、注销、获取最新版本接口代码。 报告相关。上传,删除报告功能。 增加若干实体文件

Edited 2016-11-27 15:35:15 UTC
Request to merge zhaoyue-dev into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b zhaoyue-dev origin/zhaoyue-dev

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 zhaoyue-dev

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

Merged by zhaoyue 2016-11-27 15:35:15 UTC

The changes were merged into master. The source branch has been removed.

  • Discussion 0
  • Commits 9
  • Changes 33
  • zhaoyue
    @zhaoyue 2016-11-27 15:35:15 UTC
    Master

    Status changed to merged

  • Please register or login to post a comment
2 of 66
Prev Next
zhaoyue
Assignee
zhaoyue @zhaoyue
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: fyq/xkl-interface!2