Merging Conflicts #181

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

Open

OmarioHassan opened this issue Mar 25, 2021 · 1 comment

Contributor

OmarioHassan commented Mar 25, 2021

I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan
How to fix this

Member

iliakan commented Mar 25, 2021 •

edited

Loading

Git isn't always perfect when merging translations.

You can just compare English version with Arabic side by side.

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