Versions Compared

Old Version 2

changes.mady.by.user user-cd56b

Saved on

compared with

New Version Current

changes.mady.by.user user-eb51a

Saved on

Key

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

Rebase - Continue

The Rebase - Continue option is available when a branch rebase results in rebase conflicts. Git shows conflicts for each file in conflict one at a time. Resolve any conflicts currently shown.

...

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.
Image Removed
Image Added