search

fortify / fcli

fcli is a command-line utility for interacting with various Fortify products
https://fortify.github.io/fcli/
Other
31 stars 17 forks source link

Merge changes on `main` onto `develop` #317

Closed rsenden closed 1 year ago

rsenden commented 1 year ago

The main branch contains some fixes/features that are not available in the develop branch yet; should we merge these into develop to allow for QA testing of the combined changes, or should we just merge develop onto main once we're ready for the 2.0.0 release?

MikeTheSnowman commented 1 year ago

@rsenden is there any concerns or risks if we merge in the changes/fixes from main to development?

rsenden commented 1 year ago

@wtfacoconut not sure whether this would cause issues when merging develop onto main, but I guess we'd just get a merge commit when merging main onto develop and then another merge commit when merging develop back onto main?

rsenden commented 1 year ago

Done