build: merge v6.269.0 back to develop #8897
Merged
Conversation
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
build: release v6.269.0
kevin9foong
changed the title
eliotlim
approved these changes
Nov 14, 2025
Contributor
eliotlim
left a comment
eliotlim
left a comment
There was a problem hiding this comment.
LGTM! 👍
I think the changelog diffs highlight one minor drawback of a non-linear git history
- commit hashes are different because the history is different
- and different commits are released at different times.
|
|
||
| - build: release v6.268.0 [`#8875`](https://github.com/opengovsg/FormSG/pull/8875) | ||
| - fix: changes from feat/add-hotfix-script [`d845902`](https://github.com/opengovsg/FormSG/commit/d845902902e162314761c0c0c266360a93616c35) | ||
| - chore: bump version to v6.268.1 [`6817482`](https://github.com/opengovsg/FormSG/commit/6817482b353f63137759f33d399db5fd061efb3d) |
Contributor
There was a problem hiding this comment.
this is the actual hotfix which we wanted to introduce!
| - build(deps): bump next from 15.3.4 to 15.5.2 in /react-email-preview [`#8660`](https://github.com/opengovsg/FormSG/pull/8660) | ||
| - fix(deps): bump next from 15.3.4 to 15.5.2 [`#8661`](https://github.com/opengovsg/FormSG/pull/8661) | ||
| - build(deps-dev): bump vite from 5.4.19 to 5.4.20 in /frontend [`#8686`](https://github.com/opengovsg/FormSG/pull/8686) | ||
| - fix: home number fields are added to the draft despite not being modified [`#8704`](https://github.com/opengovsg/FormSG/pull/8704) |
Contributor
There was a problem hiding this comment.
this change was deployed to production on 16th Sept, but only merged into develop on 17th Sept.
| - build: merge release v6.240.0 to develop [`#8695`](https://github.com/opengovsg/FormSG/pull/8695) | ||
| - build: release v6.240.0 [`#8693`](https://github.com/opengovsg/FormSG/pull/8693) | ||
| - chore: bump version to v6.241.0 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d) | ||
| - chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68) |
Contributor
There was a problem hiding this comment.
one downside of a non-linear git history: commit hashes are different on different branches
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.