search

PecanProject / pecan

The Predictive Ecosystem Analyzer (PEcAn) is an integrated ecological bioinformatics toolbox.
www.pecanproject.org
Other
199 stars 230 forks source link

sync release patches to develop #3316

Closed infotroph closed 5 days ago

infotroph commented 5 days ago

Syncing now especially to bring in changelog edits before any conflicting changes accumulate in develop. We'll merge the tagged version into develop again at release time, so it's OK to merge this now without waiting for straggler patches.

[edited for clarity to include the gist of the comments below]

mdietze commented 5 days ago

Just to confirm, should this stay open until the release is final?

infotroph commented 5 days ago

@mdietze No, I was thinking of this as bringing the changelog edits back over into develop before any conflicting edits accumulate there; we'll merge again at release time to make sure all other changes are propagrated -- I'll defer to Rob on the exact order.