Versions Compared

Old Version 3

changes.mady.by.user user-cd56b

Saved on

compared with

New Version 4

changes.mady.by.user user-5d3f2

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

 |
When you click OK, the output from the Git command is shown in the text box. If a merge conflict exists, the files in conflict are shown in the repository with a Git Status of Conflict. This can be resolved using the Resolve Conflict menu option. Other errors may need to be resolved externally using the Git command line or a third-party tool.