Closed MunroRaymaker closed 6 months ago
Struggling to push a commit that resolve the conflicts. A lot has happened in master since I created this pullrequest. I getting this error when I try a git push:
JRN@DK-PC MINGW64 /c/src/github/Bogus_branch_with_changes_to_danish_cpr/Source (dk-extensions-cpr-number) $ git push fatal: The current branch dk-extensions-cpr-number has no upstream branch. To push the current branch and set the remote as upstream, use
git push --set-upstream origin dk-extensions-cpr-number
To have this happen automatically for branches without a tracking upstream, see 'push.autoSetupRemote' in 'git help config'.
Don't understand why I need to create an upstream branch. Thought that was already there.
It does look like the upstream branch is present on your repo. Perhaps it would be easiest to start over on a fresh branch?
Merge conflict should be resolved; The crux of the problem is a conversion to file-scoped namespaces that had a bad merge conflict; also, maybe try "force push with lease" on the PR and see if it goes.
If the build passes; we will merge. Thanks again for the PR.
@NielsPilgaard @MunroRaymaker if you could have one last look to ensure the rebase was successful that would be great.
Lots of thanks, Brian
Thanks guys for help with the PR 🥇
Bogus v35.3.0 includes this PR:
Thanks again, -Brian
Some older systems still use CPR number checksum validation. This updates the danish CPR number extension, to optionally create CPR numbers that can be validated against checksums. Unit tests are also provided for the extension updates.