Rebase - Skip

The Rebase - Skip option is available when a branch rebase results in rebase conflicts. Git shows conflicts for each file with a conflict one at a time. To bypass the commit that has caused the current conflict, navigate to the Git repository folder in the Version Control tab. Right-click the folder and select Version Control -> Rebase - Skip. When the confirmation dialog is displayed, press OK. This runs the "git rebase –skip" command. The commit that caused the conflict will not be included in the rebased branch. 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.