AnalysisTree, converter from CBMROOT & AnalysisTreeQA
1 unresolved thread
1 unresolved thread
AnalysisTree and AnalysisTreeQA packages are added as externals.
Converter from CBMROOT data format to AnalysisTree is implemented under analysis/common
Merge request reports
Activity
Filter activity
I think the problem is that I merged first origin/analysistree -> origin/master, and then upstream/master -> origin/master, not vice versa. That is why fast-forward merging puts my commit in front of other commits. Should I do something with that? For me, it looks strange, but as I understand that's how fast-forward works
Dear @v.klochkov,
you should not use merge at all. You always should use rebase. Could you simply create a new MR with the proper usage of svn rebase.
Please register or sign in to reply