NeuroTechX / learn.neurotechedu.com

Source code for our open-source EDU website
MIT License
72 stars 29 forks source link

Fix git conflicts when cloning test.neurotechedu #37

Open ksarmentrout opened 6 years ago

ksarmentrout commented 6 years ago

Cloning the test repo found at https://github.com/NeuroTechEDU-test/test.neurotechedu.com and making a pull request with changes back to it results in old, incompatible commits being carried along. Changes to files like CNAME and config.yml are being included as a result of commits from Febrary/March that are somehow not reflected in this repo.

learn.neurotechedu and test.neurotechedu should be synced so that these old commits are no longer included in fresh clones of test.neurotechedu.