The git pull --rebase ended up completely conflicted (whole file), so I had to reapply manually. In test at the moment.