Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
V
vue_chat
  • 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
  • Hứa Minh Thành
  • vue_chat
  • Merge Requests
  • !5

Merged
Opened Dec 18, 2020 by Hứa Minh Thành@thanhhm 
  • Report abuse
Report abuse

show + edit info & avatar user

Edited Dec 25, 2020 by Hứa Minh Thành
×

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/php/thanhhm/xios_firebase origin/feature/php/thanhhm/xios_firebase

Step 2. Review the changes locally

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

git checkout develop
git merge --no-ff feature/php/thanhhm/xios_firebase

Step 4. Push the result of the merge to GitLab

git push origin develop

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 4
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Hứa Minh Thành @thanhhm

    added 1 commit

    • 18bf7b72 - upload avatar

    Compare with previous version

    Dec 25, 2020

    added 1 commit

    • 18bf7b72 - upload avatar

    Compare with previous version

    added 1 commit * 18bf7b72 - upload avatar [Compare with previous version](https://gitlab.zigexn.vn/thanhhm/vue_chat/merge_requests/5/diffs?diff_id=5229&start_sha=67ea6321f9a8414f57d3c5a9f0d3bd35e8c8dc02)
    Toggle commit list
  • Hứa Minh Thành @thanhhm

    added 5 commits

    • 18bf7b72...f7730f38 - 4 commits from branch develop
    • da079ae9 - Merge branch 'develop' of gitlab.zigexn.vn:thanhhm/vue_chat into feature/php/thanhhm/xios_firebase

    Compare with previous version

    Dec 25, 2020

    added 5 commits

    • 18bf7b72...f7730f38 - 4 commits from branch develop
    • da079ae9 - Merge branch 'develop' of gitlab.zigexn.vn:thanhhm/vue_chat into feature/php/thanhhm/xios_firebase

    Compare with previous version

    added 5 commits * 18bf7b72...f7730f38 - 4 commits from branch `develop` * da079ae9 - Merge branch 'develop' of gitlab.zigexn.vn:thanhhm/vue_chat into feature/php/thanhhm/xios_firebase [Compare with previous version](https://gitlab.zigexn.vn/thanhhm/vue_chat/merge_requests/5/diffs?diff_id=5230&start_sha=18bf7b72de8ffd76e32cf99cf18570e8b42bf23a)
    Toggle commit list
  • Hứa Minh Thành @thanhhm

    unmarked as a Work In Progress

    Dec 25, 2020

    unmarked as a Work In Progress

    unmarked as a **Work In Progress**
    Toggle commit list
  • Hứa Minh Thành @thanhhm

    mentioned in commit ce7d21d7

    Dec 25, 2020

    mentioned in commit ce7d21d7

    mentioned in commit ce7d21d7721fe565e5b77317dd5c31c55c3dabe0
    Toggle commit list
  • Hứa Minh Thành @thanhhm

    merged

    Dec 25, 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
Nguyen Vo Huy Hoang
Assignee
Nguyen Vo Huy Hoang @hoangnvh
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: thanhhm/vue_chat!5
×

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.