Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
H
haoban-manage3.0
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • haoban3.0
  • haoban-manage3.0
  • Merge Requests
  • !95

Merged
Opened Jan 04, 2021 by qwmqiuwenmin@qwmqiuwenmin 
  • Report abuse
Report abuse

fix

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b developer origin/developer

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 developer

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.

  • Discussion 0
  • Commits 2
  • Changes 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • qwmqiuwenmin @qwmqiuwenmin

    added 25 commits

    • da66f5f2...eb433057 - 24 commits from branch master
    • c673f517 - Merge branch 'master' into 'developer'

    Compare with previous version

    Jan 04, 2021

    added 25 commits

    • da66f5f2...eb433057 - 24 commits from branch master
    • c673f517 - Merge branch 'master' into 'developer'

    Compare with previous version

    added 25 commits <ul><li>da66f5f2...eb433057 - 24 commits from branch <code>master</code></li><li>c673f517 - Merge branch &#39;master&#39; into &#39;developer&#39;</li></ul> [Compare with previous version](http://git.gicdev.com/haoban3.0/haoban-manage3.0/merge_requests/95/diffs?diff_id=15529&start_sha=da66f5f22c762d76cf36f62104c60d5f43309f88)
    Toggle commit list
  • qwmqiuwenmin @qwmqiuwenmin

    merged

    Jan 04, 2021

    merged

    merged
    Toggle commit list
  • qwmqiuwenmin @qwmqiuwenmin

    mentioned in commit 3fa46034

    Jan 04, 2021

    mentioned in commit 3fa46034

    mentioned in commit 3fa4603404d70a437545c9c32cc39dacb790f78d
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
qwmqiuwenmin
Assignee
qwmqiuwenmin @qwmqiuwenmin
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: haoban3.0/haoban-manage3.0!95
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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

Cherry-pick this merge request

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