Yes, so there’s the PR here. It’s old. There are some conflicts that need resolving.
I’d read a bit about rebasing https://git-scm.com/book/en/v2/Git-Branching-Rebasing — that’s probably the same link @CuriousLearner gave
The idea is that you replay the commit on top of the new base, hence rebase.
The goal is a single commit with the changes from the patch but updated for the latest state of the development branch.
The problem is there are 13 commits. To rebase I would first squash that to one commit. (Each commit that gets written onto the base commit has to resolve conflicts, so you can end up resolving the same conflict once for each commit, which is a pain. Better just to do it once.)
Then I’d try to rebase and resolve the conflict per-file. In theory it’s just
git pull --rebase origin master but I don’t know how confident you are with git on the command line? Generally it’s much easier with a GUI. I use Git Fork https://git-fork.com/ — it’s very good, and you can optionally pay for it as and when you decide it’s earned your money (and you realise you’d be very grateful if they kept up developing it.)
With that the
pull command has a
rebase option which will step you into a graphical rebase.
Try all that. If you get stuck shout. (!!!)
Once you’ve got the patch rebased, open a fresh PR, we’ll close the old one, and we can continue.
@CuriousLearner I started a board of tickets here: https://github.com/orgs/django/projects/2 — have a look. (The
runserver one would be cool… )