Skip to content
  • Projects
  • Groups
  • Snippets
  • Help

Codecrew / Moya

  • This project
    • Loading...
  • Sign in
Go to a project
  • Project
  • Repository
  • Issues 30
  • Merge Requests 2
  • Wiki
  • Snippets
  • Settings
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
Closed
Merge Request !424 opened Oct 25, 2018 by Tuomas Riihimäki@tuomari

Massmerge of stuff, to get master to a compilable version

There is a lot of stuff, unfortunately, but most of them are needed to get the system to compile again...

This commit has been deployed to production before insomnia XX

Edited Oct 25, 2018
Request to merge feature/massmerge into master
×

Check out, review, and merge locally

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

git fetch origin
git checkout -b feature/massmerge origin/feature/massmerge

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 feature/massmerge

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.

Pipeline #159 passed
for f21a70a2.
Pipeline #159 passed with warnings
for f21a70a2.
Pipeline #159 skipped
for f21a70a2.
Pipeline #159 waiting for manual action
for f21a70a2.
Pipeline #159 canceled
for f21a70a2.
Pipeline #159 failed
for f21a70a2.
Pipeline #159 running
for f21a70a2.
Pipeline #159 pending
for f21a70a2.

Closed

The changes were not merged into master.

  • Discussion 7
  • Commits 5
  • Pipelines 1
  • Changes 21
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build triggered.

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/342/

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/342/

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/344/

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build finished. Tests FAILED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/344/

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build Started: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/345/

  • Jenkins @jenkins commented Oct 25, 2018
    Developer

    Build finished. Tests PASSED. Build results available at: https://jenkins.codecrew.fi/job/Moya/job/moya-mergerequests/345/

  • Tuomas Riihimäki @tuomari

    closed

    Oct 25, 2018

    closed

    Toggle commit list
  • Write
  • Preview
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
  • Please register or sign in to post a comment
Tuukka Kivilahti
Assignee
Tuukka Kivilahti @tkfftk
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: codecrew/moya!424