Syncfeatures : What to to if rebase fails

[cgte]

In case a rebase fails, the script exits.
Then one mays solve the issue on its own.
It would be nice to be able to hang or exit the script.
Since all the other branches may not conflict.

I usually resolve conflicts manually, then push my feature branch.

Note for later:
The check to be done may be: (! Not sure about the git revision notation here)
compare origin/master...origin/feature and make sure that all these commits are included in local/master...local/feature or origin/master...local/feature
Maybe guessing an other merge base commit to refer to.