Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'Besluit AGB/APB over retributies' form #53

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

wolfderechter
Copy link

ID

DL-5977

Description

Add the 'Besluit APB over retributies' form

Links to other PR's

@Windvis
Copy link
Contributor

Windvis commented Oct 16, 2024

Hmm, I think this needs to be rebased from a different commit. The cross referencing feature is still in development, but we merged it here already. As a result those fields will also be part of the form you generated here, but we can't release them yet I think 🤔 .

We shouldn't have merged the cross referencing PRs before the app-digitaal-loket PR was merged but it's too late for that now :/

@Windvis
Copy link
Contributor

Windvis commented Oct 16, 2024

Ok, I updated the master branch to the version that doesn't contain those cross reference changes.

Could you rebase and drop all the other commits? You will need to reset your local master branch to the one on the server first.

Something like this:

git fetch
git switch master
git reset --hard origin/master

git switch feat/add-apb-agb-over-retributies-form
git rebase -i master
(it should open up an editor where you can drop specific commits by removing them from the file)
git push --force

This also means you will have to generate a new form.ttl file and copy that to all your open PRs again. Sorry 😢. You can simply override the form.ttl contents though, no need for new migrations etc.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants