Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
ven-job
  • 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
  • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Trịnh Hoàng Phúc
  • ven-job
  • Merge Requests
  • !9

Merged
Opened Apr 15, 2020 by Trịnh Hoàng Phúc@phucth 
  • Report abuse
Report abuse

Feature/user management

Edited Apr 15, 2020 by Trịnh Hoàng Phúc
×

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/user_management_test origin/feature/user_management_test

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/user_management_test

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 3
  • Pipelines 3
  • Changes 25
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Trịnh Hoàng Phúc @phucth

    changed title from Feature/user management test to Feature/user management

    Apr 15, 2020

    changed title from Feature/user management test to Feature/user management

    changed title from **Feature/user management{- test-}** to **Feature/user management**
    Toggle commit list
  • Trịnh Hoàng Phúc @phucth

    added 10 commits

    • 275f83a2...096a9a9a - 9 commits from branch master
    • 2c0b2f55 - Merge branch 'master' of gitlab.zigexn.vn:phucth/ven-job into feature/user_management_test

    Compare with previous version

    Apr 23, 2020

    added 10 commits

    • 275f83a2...096a9a9a - 9 commits from branch master
    • 2c0b2f55 - Merge branch 'master' of gitlab.zigexn.vn:phucth/ven-job into feature/user_management_test

    Compare with previous version

    added 10 commits * 275f83a2...096a9a9a - 9 commits from branch `master` * 2c0b2f55 - Merge branch 'master' of gitlab.zigexn.vn:phucth/ven-job into feature/user_management_test [Compare with previous version](https://gitlab.zigexn.vn/phucth/ven-job/merge_requests/9/diffs?diff_id=4790&start_sha=275f83a2acff1aa9d2d4985afe67eb22db70c320)
    Toggle commit list
  • Trịnh Hoàng Phúc @phucth

    mentioned in commit 2caeabd0

    Apr 23, 2020

    mentioned in commit 2caeabd0

    mentioned in commit 2caeabd011113b5d458492ce615b93cc123cc987
    Toggle commit list
  • Trịnh Hoàng Phúc @phucth

    merged

    Apr 23, 2020

    merged

    merged
    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
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: phucth/ven-job!9
×

Revert this merge request

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.