Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

merge conflicts with beyond compare #1751

Closed
Assignees
@ghiboz

Description

hi! I use beyond compare to manage the conflicts and the left part (REMOTE) is the code I have in my machine and the right part (LOCAL) is the code on server.. for me seems swapped.. is there something to do?

Metadata

Metadata

Labels

No labels
No labels

Projects

No projects

Milestone

No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions

      AltStyle によって変換されたページ (->オリジナル) /