chore: Update flame_3d CHANGELOG.md to match main + changes [flame_3d]#3380
Merged
chore: Update flame_3d CHANGELOG.md to match main + changes [flame_3d]#3380
Conversation
spydon
approved these changes
Dec 11, 2024
luanpotter
added a commit
that referenced
this pull request
Dec 11, 2024
#3380) 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](#3377)). 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.
luanpotter
added a commit
that referenced
this pull request
Dec 11, 2024
#3380) 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](#3377)). 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.
nickf2k
pushed a commit
to nickf2k/flame
that referenced
this pull request
Nov 16, 2025
flame-engine#3380) 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](flame-engine#3377)). 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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
2024-09-16).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
docsand added dartdoc comments with///.examplesordocs.Breaking Change?