Versions Compared

Key

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

...

Just like a merge, a rebase may fail due to merge conflicts. If that happens, SmartGit will leave the working tree in rebasing state, allowing you to either manually resolve the conflicts or to Abort the rebase. See Resolving Conflicts for further information.

Interactive Rebase

You can start an interactive Rebase in the Journal view by right-clicking the first commit that should be changed. For further information, please see Journal View.

Resolving Conflicts

Core Git rebase conflicts are different to other kinds of merge conflicts, because left and right files are swapped: when rebasing branch A to B, Git will first checkout B, then applies all commits from A. If a conflict occurs, HEAD still points to B and hence the left file would be the file as it's present in B.

...