Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

涂亚平 / subsidy

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge Request !1 opened Jul 25, 2022 by 邓敏@DM

Websocker

Edited Jul 25, 2022
Request to merge websocker 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 websocker origin/websocker

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 websocker

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

  • The changes were merged into master.
  • Discussion 0
  • Commits 89
  • Changes 452
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 581cbd1fb8bf8b1b27ed4698a71494d9?s=80&d=identicon
    涂亚平
    @TYP started a discussion on commit d60823da Feb 08, 2022
    • @TYP 涂亚平
      @TYP

      mentioned in commit eede23cb

      Feb 08, 2022

      mentioned in commit eede23cb

      Toggle commit list
  • 581cbd1fb8bf8b1b27ed4698a71494d9?s=80&d=identicon
    涂亚平
    @TYP started a discussion on commit a74b24ef Feb 11, 2022
    • @TYP 涂亚平
      @TYP

      mentioned in commit 761eaf22

      Feb 11, 2022

      mentioned in commit 761eaf22

      Toggle commit list
  • @DM 邓敏
    @DM

    merged

    Jul 25, 2022

    merged

    Toggle commit list
  • @DM 邓敏
    @DM

    mentioned in commit b8a6f5cc

    Jul 25, 2022

    mentioned in commit b8a6f5cc

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
邓敏
Assignee
邓敏 @DM
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: TYP/subsidy!1
×

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.