Closed jluebeck closed 2 years ago
May resolve merge conflicts and merge
Thanks, Viraj - let me know if there is anything I can do to help with resolving the merge conflicts. I think I don't have permissions to do it directly.
Thanks, Viraj - let me know if there is anything I can do to help with resolving the merge conflicts. I think I don't have permissions to do it directly.
You need to merge vdeshpande:master into jluebeck:master. This will show you all the merge conflicts on your branch. You can then resolve those and stage and commit the files for which you fixed the merge conflicts. Once you push the new commit, Github should allow us to merge the branch into master.
Fixed all conflicts and merged into my fork. Should be ready to go!
Hi Viraj, it looks like only those with write access to the repository can merge the approved pull requests. Thanks!
Jens
Thanks for the updates. Is this ready to merge?
Version 1.3_r1 supports both python3 and python2. This release also corrects a bug in the visualization of amplicon copy numbers for genome segments < 50kbp and includes small improvements to seed filtering and merging of nearby segments. Complete changelog available here.