search

youngser / D3M2

0 stars 0 forks source link

Add docs and comments in python code #10

Open disa-mhembere opened 7 years ago

disa-mhembere commented 7 years ago

Anywhere it says TODO: YP there are docs missing that are best done by someone who will use the right words.

youngser commented 7 years ago

Do I do this in the master branch or api? Are you going to merge everything to master?

disa-mhembere commented 7 years ago

You can just do this do this in master

youngser commented 7 years ago

Sorry, but I think I messed up again. I got this

[parky@YPMBP16]$ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

[parky@YPMBP16]$ git push
To https://github.com/youngser/D3M.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/youngser/D3M.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngser commented 7 years ago

I think I fixed it.