search

MDAnalysis / WorkshopHackathon2018

Materials, issues and things for the 2018 Workshop and Hackathon
https://www.mdanalysis.org/WorkshopHackathon2018/
GNU General Public License v3.0
14 stars 25 forks source link

Datreant notebook not working #46

Open GianFree opened 5 years ago

GianFree commented 5 years ago

Hi! I was trying to use the Managing_data_with_datreant.ipynb notebook in the Advanced tutorials, but it cannot be read from jupyter. I had a look at the code and it seems to me that the wrong file was pushed, since it shows something like a gitdiff between a HEAD version and the commit 0c5cef6.

From the raw file:

>>>>>>> 0c5cef6... started datreant notebook
    "We'll jump straight in to a messy directory of simulation results,\n",
    "these are moderately organised, but are a little scattered:\n",
    "\n",
    "```\n",
    "datreant_data\n",
    " +-- other_dir\n",
<<<<<<< HEAD
    " |   +-- sim_T300\n",
    " |   +-- sim_T400\n",
    " |   +-- sim_T500\n",
    " |   +-- sim_T600\n",
    " +-- sim_T100\n",
    " +-- sim_T200\n",
    " +-- sim_T300\n",
    " +-- sim_T400\n",

Thank you for your time.

orbeckst commented 5 years ago

@richardjgowers @dotsdl can you please check and submit a correct notebook or unmangle the merge?