Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
C
car-controlserver
  • Project
    • Project
    • 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
  • wenzhongjian
  • car-controlserver
  • Merge Requests
  • !3

Closed
Opened Apr 01, 2025 by 957dd@leimingyu 
  • Report abuse
Report abuse

WIP: Feature/fort car

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/fort-car origin/feature/fort-car

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/fort-car

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 1
  • Commits 2
  • Changes 8
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • 957dd @leimingyu commented · Apr 01, 2025
    Maintainer

    更新了 炮台逻辑

    更新了 炮台逻辑
  • 957dd @leimingyu

    added 1 commit

    • 7c005c69 - 增加了云台的逻辑

    Compare with previous version

    · Apr 01, 2025

    added 1 commit

    • 7c005c69 - 增加了云台的逻辑

    Compare with previous version

    added 1 commit <ul><li>7c005c69 - 增加了云台的逻辑</li></ul> [Compare with previous version](http://git.yd-ss.com/wenzhongjian/car-controlserver/merge_requests/3/diffs?diff_id=5&start_sha=707083c7529fbb31d47eab7bc2e8eda482a454d9)
    Toggle commit list
  • 957dd @leimingyu

    added 1 commit

    • 75d9ae3e - 增加了云台的逻辑

    Compare with previous version

    · Apr 01, 2025

    added 1 commit

    • 75d9ae3e - 增加了云台的逻辑

    Compare with previous version

    added 1 commit <ul><li>75d9ae3e - 增加了云台的逻辑</li></ul> [Compare with previous version](http://git.yd-ss.com/wenzhongjian/car-controlserver/merge_requests/3/diffs?diff_id=6&start_sha=7c005c6935e8d07b1877637989c9c2d54d521d5d)
    Toggle commit list
  • 957dd @leimingyu

    closed

    · Apr 01, 2025

    closed

    closed
    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
0
Labels
None
Assign labels
  • View project labels
Reference: wenzhongjian/car-controlserver!3