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.

To use this action, navigate to the Git repository folder in the Version Control tab. Right-click the folder and select Version Control -> Rebase - Continue. When the confirmation dialog is displayed, press OK. This runs the "git rebase –continue" command which will continue the rebase operation until it finds the next conflict or completes. If another conflict is found then repeat this process. See Git documentation for further details.

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.