When interactively rebasing within a branch (e.g. to remove a set of commits), the interactive rebase dialog shows way too much history to select. If the user selects the "correct" part of the history to pick, rebase will be successful. If the users selects anything outside the actually useful range the rebase will fail with merge conflicts.
Note: The example screen shots are from an internal repository hence names and commit messages are blurred. The rebase was on develop to be rebased to b5722f7b4 (in order to remove the merge commit in-between).
When interactively rebasing within a branch (e.g. to remove a set of commits), the interactive rebase dialog shows way too much history to select. If the user selects the "correct" part of the history to pick, rebase will be successful. If the users selects anything outside the actually useful range the rebase will fail with merge conflicts.
Note: The example screen shots are from an internal repository hence names and commit messages are blurred. The rebase was on
developto be rebased to b5722f7b4 (in order to remove the merge commit in-between).