Update LimnoTech from Respec Release; try again...

LimnoTech / HSPsquared

Hydrologic Simulation Program Python (HSPsquared)

GNU Affero General Public License v3.0

2 stars 0 forks source link

Update LimnoTech from Respec Release; try again... #45

Closed aufdenkampe closed 2 years ago

aufdenkampe commented 2 years ago

In anticipation of a PR from us, Respec just released all of their improvements and bug fixes to https://github.com/respec/HSPsquared/releases/tag/0.9.2.

After we merge this, we should update HSP2/__init__.py to the next version number: 0.10.0

aufdenkampe commented 2 years ago

When I tried to update LimnoTech develop from Respec's develop, I decided to resolve the merge conflict in the browser but this caused the backward merge from LimnoTech to develop! That's not what I intended. I need to remember that behavior and handle those kinds of merge conflicts by directly editing our branch!