fix page edit link slug

[xini]

After uploading a file and clicking on 'done', the site throws a 404 due to the incurrect url.

[robbieaverill]

Which version of SS are you using?

[xini]

3.6.3

[robbieaverill]

Would you mind changing the branch to 2.0 and rebasing onto it, please?

[xini]

my PR needs https://github.com/silverstripe/silverstripe-dms/commit/0d27e614cdd47ed9c04acadfbf90aaf746056879, which is not on 2.0, but only master and 2.1.

How do I change branch and rebase correctly, without making a mess?

[robbieaverill]

Oh, ok - can we do 2.1 instead? You can switch the branch in this PR via the "Edit" button, top right corner, then switch the target branch there.

Rebasing:

git fetch origin # or whatever the upstream remote is called for the source repo
git rebase -i origin/2.1
# close and save (shouldn't have any conflicts)
git push yourremote patch-1 --force

[xini]

yep. but how do I do it without creating a mess? tried several commands but not sure how this works?

[robbieaverill]

I can do it for you =) hold fire

[xini]

thanks. but how did you do it?

[robbieaverill]

@xini the commands I gave you above - there were some conflicts, which I resolved manually to keep the change you made and bring back the casting as int that was in master (SQL injection fix). If you want some light reading, here's a good article on it =)

[xini]

thanks ;)

[robbieaverill]

Released as 2.1.3 - thanks @xini

[xini]

awesome, thanks!