Skip to content

Conversation

@dhananjay12
Copy link
Contributor

@dhananjay12 dhananjay12 commented Nov 22, 2021

Getting version conflict when creating main->release PR. (Probably because the release branch was not merged back to main during the last release).
version-update-0.15.1-snapshot branch is just a brach created vis github UI while resolving conflitcs during main->release PR.

@dhananjay12 dhananjay12 changed the base branch from release to main November 22, 2021 07:22
@dhananjay12 dhananjay12 changed the base branch from main to release November 22, 2021 07:23
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@bartveenstra bartveenstra merged commit b7e4f5d into release Nov 22, 2021
@santam85 santam85 deleted the version-update-0.15.1-snapshot branch July 6, 2022 13:51
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.

5 participants