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

DNA-RNA hybrid model #68

Merged
merged 62 commits into from
Sep 26, 2023
Merged

Conversation

eryykr
Copy link
Contributor

@eryykr eryykr commented Sep 19, 2023

No description provided.

@ErikPoppleton
Copy link
Collaborator

Excited to see this update! It looks like you've got a bunch of test files in analysis/test. There is a script in there called cleanup.sh which will remove all the generated files to clean up the commit. Can you please run that to remove the files?

@eryykr
Copy link
Contributor Author

eryykr commented Sep 20, 2023 via email

@lorenzo-rovigatti
Copy link
Owner

Thanks for the PR, this will be a great addition to the code! I'm trying to make sense of the changes so that I can make sure that we are not going to break anything. In the meantime, can you resolve MCBackend.cpp's conflict? I have the impression that you didn't make any changes to the file yourself, but it's just a bit outdated with respect to the master one.

@lorenzo-rovigatti
Copy link
Owner

lorenzo-rovigatti commented Sep 20, 2023

Sorry for the multiple messages. The other issue I see is that you are trying to merge with master a branch that was merged with new_topology. I think we need to first merge that into master, and then we can go ahead with this one.

@ErikPoppleton
Copy link
Collaborator

Sorry for the multiple messages. The other issue I see is that you are trying to merge with master a branch that was merged with new_topology. I think we need to first merge that into master, and then we can go ahead with this one.

We also need to merge oat_dev into new_topology first since I also rewrote convert.py and the oat data structures/readers to work with the new topology.

@lorenzo-rovigatti
Copy link
Owner

Erik and I are working on the new topology branch. We plan to merge it later this week and then I'll start working on this one. However, since there are some core files that are involved, I think it would be better if we could merge your code into a non-master branch. I don't know if you can change that after you created the PR or you have to make a new one. If you can't edit this one then I'll close it and you can make a new one.

@eryykr eryykr changed the base branch from master to new_topology September 25, 2023 12:01
@eryykr
Copy link
Contributor Author

eryykr commented Sep 25, 2023 via email

@lorenzo-rovigatti lorenzo-rovigatti changed the base branch from new_topology to dna_rna September 25, 2023 15:06
@lorenzo-rovigatti
Copy link
Owner

Thanks! I have created a new branch (dna_rna) and make this PR point to that one instead. Can you resolve the conflicts so that I merge it and then test it appropriately?

@lorenzo-rovigatti lorenzo-rovigatti merged commit 1b88844 into lorenzo-rovigatti:dna_rna Sep 26, 2023
@lorenzo-rovigatti
Copy link
Owner

@eryykr thanks again for the PR! I have merged it into a separate branch and will work on merging it to master as soon as I'm done with oat_dev.

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

Successfully merging this pull request may close these issues.

None yet

3 participants