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

chore: Update flame_3d CHANGELOG.md to match main + changes [flame_3d] #3380

Open
wants to merge 1 commit into
base: flame_3d
Choose a base branch
from

Conversation

luanpotter
Copy link
Member

Description

Update flame_3d CHANGELOG.md to match main + changes.

This is the second step in merging flame_3d into main. Before we do a final rebase of main back, the last "conflict" is the changelog file (as can be seen on the temporary PR diff).

In order to solve this conflict, this does the following steps:

  • Collect the changes from flame_3d compared to the current base branch version of main (i.e.: everything that was added to the changelog; this turns out to be two entries for the same day, 2024-09-16).
  • Replace the CHANGELOG.md file with the latest from current main
  • Add back the missing entries, but I have doctored the days to be today (2024-12-10), in order to not "alter the past". I am happy with keeping the original date, though. No strong preference either way.

Once this is merged, the diff PR should show no conflict, and we should be able to finally rebase it with current main to get rid of all the extraneous files. Finally, we can create a new merge PR and the diff should be exactly what we want.

Checklist

  • I have followed the Contributor Guide when preparing my PR.
  • I have updated/added tests for ALL new/updated/fixed functionality.
  • I have updated/added relevant documentation in docs and added dartdoc comments with ///.
  • I have updated/added relevant examples in examples or docs.

Breaking Change?

  • Yes, this PR is a breaking change.
  • No, this PR is not a breaking change.

@luanpotter luanpotter marked this pull request as ready for review December 11, 2024 04:51
@luanpotter luanpotter requested a review from spydon December 11, 2024 04: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.

1 participant