ar.javascript.info icon indicating copy to clipboard operation
ar.javascript.info copied to clipboard
verified publisher icon javascript-tutorial

Merging Conflicts

Open OmarioHassan opened this issue 4 years ago • 1 comments

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

OmarioHassan avatar Mar 25 '21 10:03 OmarioHassan

Git isn't always perfect when merging translations.

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

iliakan avatar Mar 25 '21 12:03 iliakan