• 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 !109 opened 2019-04-25 07:39:25 UTC by陈峰@chenfeng163

Feature/change

Edited 2019-04-26 02:12:31 UTC
Request to merge feature/change 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 feature/change origin/feature/change

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 feature/change

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 陈峰 2019-04-26 02:12:31 UTC

The changes were merged into master.

  • Discussion 0
  • Commits 5
  • Changes 13
  • 陈峰
    @chenfeng163 2019-04-25 08:14:47 UTC

    Added 3 commits:

    • b6ba3a81 - commit
    • 6a4f4b18 - commit
    • 5113a01f - commit
  • 陈峰
    @chenfeng163 2019-04-26 02:12:31 UTC

    mentioned in commit d006d1af

  • 陈峰
    @chenfeng163 2019-04-26 02:12:31 UTC

    Status changed to merged

  • Please register or login to post a comment
109 of 110
Prev Next
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
0
0 participants
Reference: fe/yohoblk-wap!109
×

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.