Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

黄嘉阳 / iot-platform-server

  • 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 Apr 08, 2024 by 龚榕城@gongrc 

Hotfix 20240408

track 类型修改

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b hotfix-20240408 origin/hotfix-20240408

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 hotfix-20240408

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
  • Changes 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 罗志长 @luozz

    added 3 commits

    • d3adc875...6f56a36d - 2 commits from branch master
    • f9d3ee91 - Merge branch 'master' into 'hotfix-20240408'

    Compare with previous version

    Apr 08, 2024

    added 3 commits

    • d3adc875...6f56a36d - 2 commits from branch master
    • f9d3ee91 - Merge branch 'master' into 'hotfix-20240408'

    Compare with previous version

    added 3 commits * d3adc875...6f56a36d - 2 commits from branch `master` * f9d3ee91 - Merge branch 'master' into 'hotfix-20240408' [Compare with previous version](http://git.xmmakeit.com/huangjiay/iot-platform-server/merge_requests/1/diffs?diff_id=156&start_sha=d3adc8750448d59c6c555b9c2a6db0337133c935)
    Toggle commit list
  • 罗志长 @luozz

    merged

    Apr 08, 2024

    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
罗志长 @luozz
Assign to
None
Milestone
None
Assign milestone
Time tracking
2
2 participants
Reference: huangjiay/iot-platform-server!1