You can rebase while keeping all of the commits in your feature branch, you will just be asked to resolve conflicts for each one of them (if any). I don't unde

You can rebase while keeping all of the commits in your feature branch, you will just be asked to resolve conflicts for each one of them (if any). I don't understand what the fuss is all about.