Skip to content
  • P
    Projects
  • G
    Groups
  • S
    Snippets
  • Help

CIRCLE / cloud

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 94
  • Merge Requests 10
  • Pipelines
  • Wiki
  • Snippets
  • Members
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Merged
Merge request !417 opened Oct 21, 2020 by Szeberényi Imre@szebi 
  • Report abuse
Report abuse

Smallville fix

×

Check out, review, and merge locally

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

git fetch origin
git checkout -b smallville_fix origin/smallville_fix

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 smallville_fix

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 3
  • Pipelines 2
  • Changes 5
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Szeberényi Imre @szebi

    added 109 commits

    • fa743214...76a2a4a6 - 108 commits from branch master
    • 1ab77c1f - Merge branch 'master' into 'smallville_fix'

    Compare with previous version

    Jan 27, 2021

    added 109 commits

    • fa743214...76a2a4a6 - 108 commits from branch master
    • 1ab77c1f - Merge branch 'master' into 'smallville_fix'

    Compare with previous version

    added 109 commits * fa743214...76a2a4a6 - 108 commits from branch `master` * 1ab77c1f - Merge branch 'master' into 'smallville_fix' [Compare with previous version](https://git.ik.bme.hu/circle/cloud/merge_requests/417/diffs?diff_id=1084&start_sha=fa7432146228610cb396579edd67631273ae9718)
    Toggle commit list
  • Szeberényi Imre @szebi

    merged

    Jan 27, 2021

    merged

    merged
    Toggle commit list
  • Szeberényi Imre @szebi

    mentioned in commit 4937c30e

    Jan 27, 2021

    mentioned in commit 4937c30e

    mentioned in commit 4937c30ef4b0692de2210d035743e42563d8a622
    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
0
Labels
None
Assign labels
  • View labels
1
1 participant
Reference: circle/cloud!417
×

Revert this merge request

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.