Since there was still some issues I have checked out it locally and made some changes on it. In order to avoid an extra commit or a separate branch that will be squashed it's possible to make the changes directly with:
Code: Select all
git cherry-pick --ff <HASH>
git reset --soft HEAD~1
# make the changes
git add <modified files>
git commit -C HEAD@{1}
git push