← 输入框|github.com|刷新
Skip to content

Merging Conflicts #181

Open
Open
Merging Conflicts#181

Description

@OmarioHassan
OmarioHassan
opened on 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
image

Activity

  1. iliakan commented on Mar 25, 2021

    @iliakan
    iliakan
    on Mar 25, 2021
    Member

    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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions