I have realized this mistake direct. I think I menage to solve it and has change some local settings to hopefully avoid that this happen again.
@s.neuhaus
I think you did a merge instead of a rebase, probably on the advice of the git CLI which is confused by our workflow.
What you will ne...
I fixed this overlap in the last commit.
-
2e1b1fa3 · update setup_sis100_cfv with rich_v23b
- ... and 1 more commit. Compare 5524fdf3...2e1b1fa3
accepted
merge request
!297
"Provide RICH CFV v23b based on setup v23a"
at
CbmSoft / cbmroot_geometry
approved
merge request
!297
"Provide RICH CFV v23b based on setup v23a"
at
CbmSoft / cbmroot_geometry
commented on
merge request !297
"Provide RICH CFV v23b based on setup v23a"
at
CbmSoft / cbmroot_geometry
@f.kornas,...
commented on
merge request !297
"Provide RICH CFV v23b based on setup v23a"
at
CbmSoft / cbmroot_geometry
What is the reason that this is not merged yet? When will it be done?