• This project
    • Loading...
  • Sign in

fe / YOHOBUYWAP · Merge Requests

Go to a project

GitLab

  • Go to group
  • 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 !10 opened 2017-02-04 09:06:06 UTC by毕凯@bikai

地址ID重复加密问题修复

Edited 2017-02-04 09:09:59 UTC
Request to merge hotfix/addressId 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 hotfix/addressId origin/hotfix/addressId

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 hotfix/addressId

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 黄涛 2017-02-04 09:09:59 UTC

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

  • Discussion 0
  • Commits 1
  • Changes 2
  • 黄涛
    @huangtao 2017-02-04 09:09:59 UTC
    Developer

    mentioned in commit 47f2540b

  • 黄涛
    @huangtao 2017-02-04 09:09:59 UTC
    Developer

    Status changed to merged

  • Please register or login to post a comment
10 of 13
Prev Next
黄涛
Assignee
黄涛 @huangtao
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/YOHOBUYWAP!10
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.