Rebase

go to your master and do the following:

1. git checkout master
2. git reset --hard origin/master
3. git checkout yourworkingbranch
4. git rebase -i master
5. git push -f REMOTE yourworkingbranch

where you should adjust REMOTE and yourworkingbranch

I don't know why there is a rebase required still.

added 2 commits

• 38018f13 - 1 commit from branch master
• 099bea32 - Fixed invariant mass calcuation.

Compare with previous version

enabled an automatic merge when the pipeline for 099bea32 succeeds

approved this merge request

canceled the automatic merge

merged