Skip to content
Snippets Groups Projects

AnalysisTree, converter from CBMROOT & AnalysisTreeQA

Closed Viktor Klochkov requested to merge pwg-c2f/cbmroot:master into master
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

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
    • Author Contributor

      Dear @f.uhlig, @v.friese,

      Seems like I have some strange git history now. I want to add 1 commit, but I see there are a lot of changes displayed. Tried to follow the instructions, but obviously missed something.

      Any idea what went wrong and how to do it properly?

    • Author Contributor

      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

    • Please register or sign in to reply
  • 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
Loading