Versions Compared

Key

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

...

You are notified if a rebase 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 Rebase Pending for the Git repository folder and Conflict for the files which are in conflict.

ç