Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Backend - Engine
Minds Backend - Engine
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Dependency List
    • Cycle Analytics
    • Insights
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 174
    • Issues 174
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 43
    • Merge Requests 43
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Packages
    • Packages
    • List
    • Container Registry
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Minds
  • Minds Backend - EngineMinds Backend - Engine
  • Merge Requests
  • !280

Open
Opened 2 days ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/JollyJellyfish](bug): Plus not working locally #655

Used here https://gitlab.com/minds/engine/blob/51618b7d4d1260e65cd0ef022ca51f17189ef8f5/Core/Wire/Delegates/Plus.php#L36

Check out, review, and merge locally

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

git fetch origin
git checkout -b patch-1 origin/patch-1

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff patch-1

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.

Request to merge patch-1 into master
The source branch is 1 commit behind the target branch
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #71985311 passed for e7a91267 on patch-1
          Requires approval from Deployers. Approved by
          Marcelo Rivera
          Marcelo Rivera
          Brian Hatchet
          Brian Hatchet
          Emiliano Balbuena
          Emiliano Balbuena
          Rami Albatal
          Rami Albatal
          Mark Harding
          Mark Harding
          Martin Santangelo
          Martin Santangelo
          Ready to be merged automatically. Ask someone with write access to this repository to merge this request

          Mentions #655

          Deletes source branch

          • Discussion 1
          • Commits 2
          • Pipelines 2
          • Changes 1
          • Loading...
          • Ben Hayward @benhayward.ben added MR::Awaiting Review scoped label 19 hours ago

            added MR::Awaiting Review scoped label

          • Marcelo Rivera @eiennohi approved this merge request 4 hours ago

            approved this merge request

          • Ben Hayward @benhayward.ben added Squad::Green scoped label 3 hours ago

            added Squad::Green scoped label

          • Brian Hatchet
            Brian Hatchet :speech_balloon: @brianhatchet · 1 hour ago
            Maintainer

            How can I test this?

          • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
          Please register or sign in to reply
          0 Assignees
          None
          Assign to
          None
          Milestone
          None
          Assign milestone
          None
          Time tracking
          No estimate or time spent
          2
          Labels
          MR::Awaiting Review Squad::Green
          Assign labels
          • View project labels
          Lock merge request
          Unlocked
          7
          7 participants
          user avatar
          Brian Hatchet
          user avatar
          Emiliano Balbuena
          user avatar
          Rami Albatal
          user avatar
          Mark Harding
          user avatar
          Martin Santangelo
          user avatar
          Marcelo Rivera
          user avatar
          Ben Hayward
          Reference: minds/engine!280