Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
T
third-party
  • 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
  • cooperatic-foodcoops
  • third-party
  • Merge Requests
  • !104

Merged
Opened Jan 17, 2022 by Damien Moulard@DamienM 
  • Report abuse
Report abuse

merge dev_cooperatic into dev_principale

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b dev_cooperatic origin/dev_cooperatic

Step 2. Review the changes locally

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

git checkout dev_principale
git merge --no-ff dev_cooperatic

Step 4. Push the result of the merge to GitLab

git push origin dev_principale

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 312
  • Pipelines 41
  • Changes 130
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Félicie
    @felicie started a discussion on commit 6b6c53bc Nov 23, 2021
    • Félicie @felicie

      mentioned in commit 5a758c56

      Nov 23, 2021

      mentioned in commit 5a758c56

      mentioned in commit 5a758c569b23535a57e1c2b6c7460830822d2303
      Toggle commit list
    Please register or sign in to reply
  • Damien Moulard @DamienM

    merged

    Jan 17, 2022

    merged

    merged
    Toggle commit list
  • Damien Moulard @DamienM

    mentioned in commit 348dfa61

    Jan 17, 2022

    mentioned in commit 348dfa61

    mentioned in commit 348dfa61b14f9db2568dc57cd4486480e3985d8b
    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
Reference: cooperatic-foodcoops/third-party!104
×

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.