Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos-tav
  • 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 1
    • Merge Requests 1
  • 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
  • agplv3
  • kohinos-tav
  • Merge Requests
  • !30

Merged
Opened Feb 08, 2023 by Félicie@felicie 
  • Report abuse
Report abuse

Develop

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b develop origin/develop

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 develop

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 2
  • Changes 28
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Mickael Toussaint @Mike

    merged

    Feb 08, 2023

    merged

    merged
    Toggle commit list
  • Mickael Toussaint @Mike

    mentioned in commit 04256bc6

    Feb 08, 2023

    mentioned in commit 04256bc6

    mentioned in commit 04256bc6c411ed2a2b2d2966edc25d40c2bbd1d8
    Toggle commit list
  • Julien Jorry
    @jujo started a discussion on commit b9fb1513 Jan 21, 2025
    Last updated by Julien Jorry Jan 21, 2025
    • Julien Jorry @jujo

      mentioned in commit 0160d55c

      Jan 21, 2025

      mentioned in commit 0160d55c

      mentioned in commit 0160d55c45eb91c87ea2b7c941ea6c7c67b82841
      Toggle commit list
    • Julien Jorry @jujo

      mentioned in commit 164153e4

      Jan 21, 2025

      mentioned in commit 164153e4

      mentioned in commit 164153e45a64a2f7ca518c4a024734b601ace9da
      Toggle commit list
    Please register or sign in to reply
  • 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
Reference: agplv3/kohinos-tav!30
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

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.