Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release to develop for release 4.5.0 #269

Closed
wants to merge 6 commits into from

Conversation

paulbourelly999
Copy link

PR Details

Description

Merge PR to formalize release of master into develop as part of CARMA release process for 4.5.0.

PR created automatically via CARMA release tool and Github CLI

Motivation and Context

This PR brings the tested and reviewed contents of the master release/candidate into develop for final release preparation

How Has This Been Tested?

This release branch (minus final version number changes) has been tested through the CARMA verification test plan.

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    CARMA Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@MishkaMN
Copy link

When resolving conflict, it needed to be on a separate branch or update to carma-master directly.
The option of creating new branch comes with direct support from Github to update the PR. So now the branch is a new branch than original PR: #267

@paulbourelly999
Copy link
Author

Closing in favor of #270 which includes intermediate branch for CI/CD and build scripts branch uncoupling.

@MishkaMN MishkaMN deleted the merge-4.5.0-to-develop branch October 21, 2024 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants