devtool: upgrade: tweak conflict handling

Make a couple of changes to the rebase operation:

1) Only wrap the actual rebase command in try...except since a failure
   in any of the other commands should be an error, not a warning
2) If it's a conflict (which unfortunately we can only tell by checking
   for the keyword "conflict" since git doesn't return error codes based
   on the type of error) then print a message clarifying that the user
   needs to resolve the issue themselves to finish the upgrade.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

0 files changed, 0 insertions, 0 deletions