commands: move resolve and rebase code to separate files

commands: move resolve and rebase code to separate files #4124