Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
K
kohinos
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 9
    • Issues 9
    • 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
  • cooperatic-mlc
  • kohinos
  • Merge Requests
  • !2

Merged
Opened Jan 29, 2021 by Pierre-Vincent Jacquier@pvjacquier 
  • Report abuse
Report abuse

Merge dev to fix #469

Fix #469 + clean a bit some codes + add a conf file for PHP_CodeSniffer

×

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

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 dev

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 3
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Pierre-Vincent Jacquier @pvjacquier

    merged

    By Mathieu Poisbeau on 2021-01-29T09:53:28 (imported from GitLab project)

    Jan 29, 2021

    merged

    By Mathieu Poisbeau on 2021-01-29T09:53:28 (imported from GitLab project)

    merged *By Mathieu Poisbeau on 2021-01-29T09:53:28 (imported from GitLab project)*
    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
Pierre-Vincent Jacquier
Assignee
Pierre-Vincent Jacquier @pvjacquier
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: cooperatic-mlc/kohinos!2
×

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.