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

Webtilgængelighed Første Udkast #83

Merged
merged 8 commits into from
Jan 13, 2024
Merged

Webtilgængelighed Første Udkast #83

merged 8 commits into from
Jan 13, 2024

Conversation

AAFredsted
Copy link
Collaborator

Hej Kristian,

dette er mit første udkast til de compliance-issues som, der vises på https://qualweb.di.fc.ul.pt/evaluator/https%253A%252F%252Ftest10.dataforsyningen.dk%252FDenmark.

Der er dog en tendens til, at flere underliggende issues dukker op, når nogle overliggende problemer bliver løst.
Derfor kan det være, at der skal en runde to eller tre til, før alle problemer er løst.

Du må gerne melde tilbage, når det er.
Desværre er jeg først på arbejde på fredag næste uge,
så David Vinje overtager opgaven på mandag.

Han står som contributor på min fork.

Mvh Andreas

@AAFredsted AAFredsted marked this pull request as draft January 12, 2024 14:49
@AAFredsted AAFredsted marked this pull request as ready for review January 12, 2024 14:50
Copy link
Contributor

@kbevers kbevers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Det ser godt ud @AAFredsted. Jeg prøver at rulle den ud på test og ser om ikke de fleste af fejlene i rapporten forsvinder

@kbevers kbevers merged commit 30839c2 into SDFIdk:main Jan 13, 2024
@kbevers kbevers added the backport 1.0 Backport bug fixes til 1.0 branch label Jan 13, 2024
Copy link

The backport to 1.0 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 33a44e2... Attribute, name, added to select and input fields for accesibility
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging package.json
Auto-merging src/components/coordinatetransformation/CoordinateInputField.vue
CONFLICT (content): Merge conflict in src/components/coordinatetransformation/CoordinateInputField.vue
CONFLICT (modify/delete): src/components/coordinatetransformation/CrsSelector.vue deleted in HEAD and modified in 33a44e2 (Attribute, name, added to select and input fields for accesibility).  Version 33a44e2 (Attribute, name, added to select and input fields for accesibility) of src/components/coordinatetransformation/CrsSelector.vue left in tree.
Auto-merging src/components/coordinatetransformation/InputCard.vue
CONFLICT (content): Merge conflict in src/components/coordinatetransformation/InputCard.vue

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.0 1.0
# Navigate to the new working tree
cd .worktrees/backport-1.0
# Create a new branch
git switch --create backport-83-to-1.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 33a44e2ce649229e0b1a50ed3419ef065fab20fa,4af624274d099cfa747760390ec3a9094d641ad7,64d87974439e5e612818e953b6810221331c0f24,5380a7a11f99bc7e0968da6c07ed7cf36a404090,55502fbb5ed0ca77896cbfa05b6d4c87d8749947,4446c2d099955bd3396011e22376368d7147d5da,0357a0b76afb5a1933b8e759b46af9a46af5ea89,f0367b2ed86f17991343497372837583433ba827
# Push it to GitHub
git push --set-upstream origin backport-83-to-1.0
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.0

Then, create a pull request where the base branch is 1.0 and the compare/head branch is backport-83-to-1.0.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.0 Backport bug fixes til 1.0 branch failed backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants