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
  • !23

Merged
Opened Jun 06, 2021 by François C.@fracolo 
  • Report abuse
Report abuse

Cooperatic devs

×

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 16
  • Pipelines 9
  • Changes 12
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • François C. @fracolo

    added 21 commits

    • e7104477...dfda5d22 - 20 commits from branch dev_principale
    • 8452c697 - Merge branch 'dev_principale' into 'dev_cooperatic'

    Compare with previous version

    Jun 06, 2021

    added 21 commits

    • e7104477...dfda5d22 - 20 commits from branch dev_principale
    • 8452c697 - Merge branch 'dev_principale' into 'dev_cooperatic'

    Compare with previous version

    added 21 commits <ul><li>e7104477...dfda5d22 - 20 commits from branch <code>dev_principale</code></li><li>8452c697 - Merge branch &#39;dev_principale&#39; into &#39;dev_cooperatic&#39;</li></ul> [Compare with previous version](https://gl.cooperatic.fr/cooperatic-foodcoops/third-party/merge_requests/23/diffs?diff_id=713&start_sha=e710447739190ff08966ac3578000324d8aff1d1)
    Toggle commit list
  • François C. @fracolo

    merged

    Jun 06, 2021

    merged

    merged
    Toggle commit list
  • François C. @fracolo

    mentioned in commit 28dd803c

    Jun 06, 2021

    mentioned in commit 28dd803c

    mentioned in commit 28dd803cb39621ed29b7ebb9966e249ba86dd41e
    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!23
×

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.