Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in
athena
athena
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Jira
    • Jira
  • Labels
  • Merge Requests 214
    • Merge Requests 214
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Code Review
    • Repository
    • Value Stream
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Commits
  • atlas
  • athenaathena
  • Merge Requests
  • !28143

Merged
Opened Nov 20, 2019 by Douglas Michael Schaefer@schaeDeveloper

Check out, review, and merge locally

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

git fetch "https://gitlab.cern.ch/schae/athena.git" "21.2"
git checkout -b "schae/athena-21.2" 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 "21.2"
git merge --no-ff "schae/athena-21.2"

Step 4. Push the result of the merge to GitLab

git push origin "21.2"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

add photon support triggers to EXOT5

  • Overview 6
  • Commits 1
  • Pipelines 1
  • Changes 1
  • adding photon support triggers to EXOT5 for a data driven photon+JET estimate

cc: @bcarlson

(cherry picked from commit 30b1baa3)

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: atlas/athena!28143
Source branch: 21.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.