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

Fix phonetics for 唧 #593

Merged
merged 1 commit into from
Feb 8, 2025
Merged

Fix phonetics for 唧 #593

merged 1 commit into from
Feb 8, 2025

Conversation

xatier
Copy link
Contributor

@xatier xatier commented Feb 8, 2025

To better address merge conflict from #589.

As both 唧 and 喳 are updated from recent PRs.

@Copilot Copilot bot review requested due to automatic review settings February 8, 2025 13:19

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot wasn't able to review any files in this pull request.

Files not reviewed (1)
  • Source/Data/BPMFMappings.txt: Language not supported
@xatier
Copy link
Contributor Author

xatier commented Feb 8, 2025

@lukhnos PTAL, this should better handle the case.

I typically fork off from upstream/master to fix characters respectively, hence merge conflicts may need to be handled manually. Please don't hesitate to ping me and I can address them by rebasing the 2nd PR on top of upstream tip once the 1st has been merged to master. Thanks again for reviewing/approving these PR series. 🙏

Copy link
Contributor

@lukhnos lukhnos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I typically fork off from upstream/master to fix characters respectively, hence merge conflicts may need to be handled manually. Please don't hesitate to ping me and I can address them by rebasing the 2nd PR on top of upstream tip once the 1st has been merged to master. Thanks again for reviewing/approving these PR series. 🙏

No worries, and thanks for letting me know. As for #589, it was just that I thought I should leave a note for why it wasn't immediately merged, and a bit later I happened to have some spare time to resolve the conflicts myself. Thanks again for this series of PRs!

@lukhnos lukhnos merged commit 41c93b0 into openvanilla:master Feb 8, 2025
2 checks passed
@xatier xatier deleted the ji branch February 8, 2025 19:49
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.

2 participants