• This project
    • Loading...
  • Sign in

fe / yohoblk-wap · 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 !95 opened 2018-04-27 05:41:31 UTC by李奇@yoholq

Feature/hotfix

Edited 2018-04-27 06:17:25 UTC
Request to merge feature/hotfix into gray
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/hotfix origin/feature/hotfix

Step 2. Review the changes locally

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

git checkout gray
git merge --no-ff feature/hotfix

Step 4. Push the result of the merge to GitLab

git push origin gray

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 陈峰 2018-04-27 06:17:25 UTC

The changes were merged into gray.

  • Discussion 0
  • Commits 6
  • Changes 8
  • 李奇
    @yoholq 2018-04-27 06:12:23 UTC

    Added 1 commit:

    • 0f1236cc - fixed:版本比较
  • 陈峰
    @chenfeng163 2018-04-27 06:17:25 UTC

    mentioned in commit 050a4196

  • 陈峰
    @chenfeng163 2018-04-27 06:17:25 UTC

    Status changed to merged

  • Please register or login to post a comment
95 of 110
Prev Next
陈峰
Assignee
陈峰 @chenfeng163
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/yohoblk-wap!95
×

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.