If a conflict occurs during rebase, a dialog is shown giving some information about the commit that caused the conflict. Here, key value pairs can be added, changed or deleted. Applet invisible. A', B', C' are different from the old ones as they now also contain changes F and G. In this case, the directory tree at the bottom is inactive, as the selection is not relevant for the "New Project" wizard.
nest...