Bring TOF part 2

@f.uhlig We got a strange thing, that some files @n.herrmann thought were commited yesterday are not yet in the repo.

We tried to re-push the branch but it did not find any difference with the current Official master.

I then tried to check the state of Norbert lustre folder, and I got the following output (git status -uno, which ignores the untracked files to escape the lots of all_*.par files):

On branch official_master
Your branch is ahead of 'official/master' by 15 commits.
  (use "git push" to publish your local commits)
You are currently rebasing branch 'official_master' on '78c7ace'.
  (all conflicts fixed: run "git rebase --continue")

Changes not staged for commit:
  (use "git add/rm <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   core/data/tof/CbmTofTracklet.h
	modified:   core/data/tof/CbmTofTrackletParam.h
	deleted:    macro/beamtime/hd2017/data
	modified:   macro/beamtime/mcbm2020/init_cal_all.sh
	modified:   macro/beamtime/mcbm2020/mcbm2020_reco.geo.root
	modified:   macro/beamtime/mcbm2020/mcbm_build_and_reco.C
	modified:   macro/beamtime/mcbm2020/mcbm_build_and_reco_kronos.C
	modified:   macro/beamtime/mcbm2020/mcbm_event_reco.C
	modified:   macro/beamtime/mcbm2020/mcbm_event_reco_kronos.C
	modified:   macro/beamtime/mcbm2020/mcbm_reco.C
	modified:   macro/beamtime/mcbm2020/mcbm_reco_kronos.C
	modified:   macro/beamtime/mcbm2020/unpack_tsa_mcbm.C
	modified:   macro/beamtime/mcbm2020/unpack_tsa_mcbm_kronos.C
	typechange: macro/mcbm/.rootrc
	modified:   macro/tof/beamtime/lab16/.root_hist
	modified:   mvd/ReadMeMvd.pdf
	modified:   mvd/ReadMeMvdPart2.pdf
	modified:   reco/detectors/tof/CMakeLists.txt
	modified:   reco/detectors/tof/CbmTofFindTracks.cxx
	modified:   reco/detectors/tof/CbmTofFindTracks.h
	modified:   reco/detectors/tof/CbmTofRecoLinkDef.h

no changes added to commit (use "git add" and/or "git commit -a")

=> Could it be that the rebasing was not closed and that due to this the new commits are missing?
=> Or maybe the committing + pushing was done from another folder (in GSI home or local drive)?

Edit: added the git status output for the full cbmroot