Closed echristi closed 9 years ago
Evan, I think you need to merge this manually from BarrEng/pest_tools. I tried following the steps after clicking on Use the command line above, and successfully brought all of your changes into my fork (which also contains some work that I haven't pull-requested yet), but then am still unable to update the main repo. The other pull request is for my fork (including the work since my last pull request). It also can't be automatically merged.
This will probably break some stuff but need to to move forward.