Add macros for LMVM studies
Merge request reports
Activity
Filter activity
added 7 commits
-
18da94a9...ce91d7fa - 3 commits from branch
computing:master
- 9dfafe11 - Update simulation and draw macros
- 823d81a7 - Add likelihood histogram
- 40f0c4fd - Format code with clang-format
- d9192252 - Merge branch 'master' of https://git.cbm.gsi.de/cornelius.riesen_AT_physik.uni-giessen.de/cbmroot
Toggle commit list-
18da94a9...ce91d7fa - 3 commits from branch
Hi @cornelius.riesen_AT_physik.uni-giessen.de,
as you can see at
https://git.cbm.gsi.de/cornelius.riesen_AT_physik.uni-giessen.de/cbmroot/-/network/master
your MR introduced a loop which is not allowed in our worklflow. Doing
git log
will show you the merge commit .
Doing locally
git fetch upstream git rebase -i upstream/master
should fix the issue. The interactive rebase will open an editor which you simply close without doing anything. When doing a
git log
again should not show the merge commit any longer and you can push the changes to the server.
Please register or sign in to reply