Closed r3dunlop closed 10 years ago
Hi Ryan,
Great work! Couple things:
git fetch upstream
git merge upstream/master
to pull in everyone else's work so merge conflicts don't happen. Once you do, you'll see something like
>>>>>>>>>>>>>>>>>>>>>>
x = my changes
<<<<<<<<<<<<<<<<<<<<<<
x = your changes
in the conflicting files. Edit these to be correct and recommit to resolve the merge conflict.
However, I highly suspect that the merge conflict you need to resolve here is similar / perhaps exactly the same as the merge conflict @moukaddam needs to resolve in #82; in which case, it would be a waste of either your time or his for you both to spend time fixing it. Can you guys walk me through who did what so we can sort this out?
Alright, @moukaddam successfully resolved his merge conflict at #82, and the code appears to compile (still need better testing but anyway...) @r3dunlop can you pull fetch upstream, merge, recommit and push and see if your problems go away?
Includes the addition of S3 Root variables Includes the addition of Basic GRIFFIN Root variables Updated README file Updated CMakeLists.txt to account for new detector system ROOT variables