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

php / citic-fighting

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 0
  • Merge Requests 0
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !2 opened Jun 28, 2024 by doszhang@doszhang 
  • Report abuse
Report abuse

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 master origin/master

Step 2. Review the changes locally

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

git checkout release
git merge --no-ff master

Step 4. Push the result of the merge to GitLab

git push origin release

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 1
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • doszhang @doszhang

    added 6 commits

    • 360443e2...a90a17e2 - 5 commits from branch release
    • 005b88fa - Merge branch 'release' into 'master'

    Compare with previous version

    Jun 28, 2024

    added 6 commits

    • 360443e2...a90a17e2 - 5 commits from branch release
    • 005b88fa - Merge branch 'release' into 'master'

    Compare with previous version

    added 6 commits * 360443e2...a90a17e2 - 5 commits from branch `release` * 005b88fa - Merge branch 'release' into 'master' [Compare with previous version](http://git.iacode.cn/php/citic-fighting/merge_requests/2/diffs?diff_id=2990&start_sha=360443e2125ecd58b794b7036922f8f8497fa03d)
    Toggle commit list
  • doszhang @doszhang

    mentioned in commit 48a193a5

    Jun 28, 2024

    mentioned in commit 48a193a5

    mentioned in commit 48a193a5ef6b9a0b86f742dbf8ad39c92dc28f28
    Toggle commit list
  • doszhang @doszhang

    merged

    Jun 28, 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
No assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
1 participant
Reference: php/citic-fighting!2
×

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.