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.

Sign up for GitHub

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

Jump to bottom

Add script to help resolve git merge conflicts in dict.json i18n file #3360

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from

Add basic POC script to resolve dict conflicts

18aa3f6
Select commit
Failed to load commit list.
Draft

Add script to help resolve git merge conflicts in dict.json i18n file #3360

Add basic POC script to resolve dict conflicts
18aa3f6
Select commit
Failed to load commit list.

Select a check to view from the sidebar