Versions Compared

Old Version 2

changes.mady.by.user user-cd56b

Saved on

compared with

New Version 3

changes.mady.by.user user-cd56b

Saved on

Key

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

Merge - Abort

The Merge - Abort option is available when a branch merge results in merge conflicts.

...

You are notified if a merge is pending awaiting conflicts to be resolved. A status notification bar appears at the top of the Version Control view. The Git Status column also shows Merge Pending for the Git repository folder and Conflict for the files that are in conflict.Image Removed

Image Added