Skip to content

Fix AsCurrency, StringTableEntry#127

Merged
scottanderson merged 2 commits into
localcc:mainfrom
scottanderson:string-table-entry
May 3, 2025
Merged

Fix AsCurrency, StringTableEntry#127
scottanderson merged 2 commits into
localcc:mainfrom
scottanderson:string-table-entry

Conversation

@scottanderson
Copy link
Copy Markdown
Collaborator

@scottanderson scottanderson commented Jan 12, 2025

Fixes a bug with the implementation of AsCurrency and StringTableEntry in FTextHistory.

@scottanderson scottanderson added the bug Something isn't working label Jan 12, 2025
@scottanderson scottanderson changed the title Fix FTextHistory::StringTableEntry Fix AsCurrency, StringTableEntry Jan 12, 2025
@scottanderson
Copy link
Copy Markdown
Collaborator Author

@localcc I resolved the conflict, mind taking a look? Thanks!

@localcc
Copy link
Copy Markdown
Owner

localcc commented May 3, 2025

Ah yeah, sorry for such a long delay on the review. Approved, but there seem to be conflicts which prevent rebasing, could you please resolve those?

@scottanderson
Copy link
Copy Markdown
Collaborator Author

@localcc no worries, thanks for the review. I think you're seeing that issue because I resolved the conflict with a merge, so you won't be able to rebase the change. You can still use the merge or squash and merge options, though. I personally prefer the squash and merge option in a situation like this one, where the repo is the primary upstream repo, but either one will work.

@scottanderson scottanderson merged commit 400dc15 into localcc:main May 3, 2025
9 checks passed
@scottanderson scottanderson deleted the string-table-entry branch May 3, 2025 22:58
@scottanderson
Copy link
Copy Markdown
Collaborator Author

@localcc would you mind releasing a new version of the library with this fix? Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants