Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
Gaudi
Gaudi
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 83
    • Issues 83
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge Requests 34
    • Merge Requests 34
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Incidents
    • Environments
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Code Review
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Gaudi
  • GaudiGaudi
  • Merge Requests
  • !1065

Open
Opened Apr 28, 2020 by Benjamin Michael Wynne@bwynneDeveloper
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch "https://gitlab.cern.ch/bwynne/Gaudi_gaudi.git" "FixTBBWarnings"
git checkout -b "bwynne/Gaudi_gaudi-FixTBBWarnings" FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout "master"
git merge --no-ff "bwynne/Gaudi_gaudi-FixTBBWarnings"

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.

WIP: Remove old TBB components

  • Overview 0
  • Commits 2
  • Pipelines 2
  • Changes 3

Someone already did most of the work to migrate to newer TBB, I'm just removing the old stuff that causes warnings.

Edited Apr 29, 2020 by Benjamin Michael Wynne
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: gaudi/Gaudi!1065
Source branch: FixTBBWarnings