Skip to content

FIX: Changelog after bad merge#1969

Merged
timkeo merged 1 commit intodevelopfrom
fix-release-notes
Jul 18, 2024
Merged

FIX: Changelog after bad merge#1969
timkeo merged 1 commit intodevelopfrom
fix-release-notes

Conversation

@timkeo
Copy link
Copy Markdown
Collaborator

@timkeo timkeo commented Jul 18, 2024

Description

I screwed up merging release notes from previous PR into changelog and this fixes it.

Changes made

Only modifies CHANGELOG.

Testing

N/A

Risk

N/A

Checklist

Before review:

  • Changelog entry added.
    • Explains the change in Changed, Fixed, Added sections.
    • For API change contains an example snippet and/or migration example.
    • JIRA ticket linked, example (case %%). If it is a private issue, just add the case ID without a link.
    • Jira port for the next release set as "Resolved".
  • Tests added/changed, if applicable.
    • Functional tests Area_CanDoX, Area_CanDoX_EvenIfYIsTheCase, Area_WhenIDoX_AndYHappens_ThisIsTheResult.
    • Performance tests.
    • Integration tests.
  • Docs for new/changed API's.
    • Xmldoc cross references are set correctly.
    • Added explanation how the API works.
    • Usage code examples added.
    • The manual is updated, if needed.

During merge:

  • Commit message for squash-merge is prefixed with one of the list:
    • NEW: ___.
    • FIX: ___.
    • DOCS: ___.
    • CHANGE: ___.
    • RELEASE: 1.1.0-preview.3.

After merge:

  • Create forward/backward port if needed. If you are blocked from creating a forward port now please add a task to ISX-1444.

@timkeo timkeo changed the title Fix changelog after bad merge FIX: Changelog after bad merge Jul 18, 2024
@timkeo timkeo merged commit 628d91b into develop Jul 18, 2024
@timkeo timkeo deleted the fix-release-notes branch July 18, 2024 17:45
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