search

VAMDC / NodeSoftware

Python/Django-based software for running VAMDC data nodes.
http://www.vamdc.eu
GNU General Public License v3.0
15 stars 23 forks source link

Initial commit to include IDEADB #107

Closed johannespostler closed 12 years ago

johannespostler commented 12 years ago

This is the initial pull request for IDEADB. Only files within nodes/IDEADB have been changed / added, so I don't expect any problems while merging.

ivh commented 12 years ago

Hi! Thx for the pull request. It looks mostly good, except you seem to have committed an external third-party js-library. Please undo the commit (see documentation on how to) and make a new one without it. cheers /thomas

johannespostler commented 12 years ago

Ok, I think it should be fine now :) Sorry for that, the JS libs didn't really need to live in that directory. johannes

ivh commented 12 years ago

For the future: Removing files in a new commit is not the same as undoing the commit that added the files. In the first case they remain in the history. For now I have solved this by sqashing your commits into one new which I merged to master.

Please do a "git fetch upstream; git reset --hard upstream/master; git push -f", assuming your "upstream" is the VAMDC/NodeSoftware repo here on github. This will override the history in your repo with mine. (NOTE that it also will undo any uncommited changes to files)