Closed Aziz-JH closed 4 years ago
It seems to me this PR is based on the develop branch instead of master but targeted against the hotfix. Can you update it to be based on master please?
How can I change the base of my branch?
Rough sequence of git commands (assuming you are in your repository):
# Move old branch out of the way.
git branch -m issue/55 issue/55-backup
# Create clean branch "issue/55" based on "master
git checkout --track -b issue/55 master
# Cherry pick the change from old branch
git cherry-pick 1a3e472
# Force push the new branch which is now based on master
git push -f
# All went well, remove backup of old branch
git branch -D issue/55-backup
See: https://github.com/menatwork/contao-multicolumnwizard-bundle/issues/55