Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix git conflicts when cloning test.neurotechedu #37

Open
ksarmentrout opened this issue Jun 3, 2018 · 0 comments
Open

Fix git conflicts when cloning test.neurotechedu #37

ksarmentrout opened this issue Jun 3, 2018 · 0 comments

Comments

@ksarmentrout
Copy link
Collaborator

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant