The rebase is done. On your next fetch you can:
$ git stash save
# make sure that no tracked files are in the way because the next
command WILL DESTROY ANY UNCOMMITTED CHANGES to tracked files
$ git reset --hard origin/feature/catalyst-configurator
$ git stash pop
and you are now on top of the re
Tomorrow we will rebase the feature/catalyst-configurator branch on top
of the devel branch in order for it to include all that's been in 3.4.0.
People with non-merged changes on top of that branch should hurry to get
these changes integrated before we rebase or suffer the consequence (see
git hel