kwila/tournaments
Watch
1
0
Fork
You've already forked tournaments
 1
Code Pull requests 1 Projects Releases Packages Activity Actions

feat: migrate buttons #82

Open
addison wants to merge 3 commits from feature/kwila-ui-buttons into main
pull from: feature/kwila-ui-buttons
merge into: kwila:main
Conversation 0 Commits 3 Files changed 22 +210 -203
addison commented 2026-09-17 07:41:46 -04:00
Owner
Copy link
No description provided. 
Amp-Thread-ID: https://ampcode.com/threads/T-01a0a4dc-f213-754f-871b-f4b0f8a4dd3e
Co-authored-by: Addison Emig <[email protected]>
Amp-Thread-ID: https://ampcode.com/threads/T-01a0a4dc-f213-754f-871b-f4b0f8a4dd3e
Co-authored-by: Addison Emig <[email protected]>
refactor(frontend): migrate action buttons to Kwila UI
Some checks failed
PR Validation / validate (pull_request) Failing after 55s
Details
f58f99e234
 
Amp-Thread-ID: https://ampcode.com/threads/T-01a0a4dc-f213-754f-871b-f4b0f8a4dd3e
Co-authored-by: Addison Emig <[email protected]>
Some checks failed
PR Validation / validate (pull_request) Failing after 55s
Details
This pull request has changes conflicting with the target branch.
  • frontend/package-lock.json
  • frontend/package.json
  • frontend/src/app/competitions/competition-overview.html
  • frontend/src/app/competitions/competition-overview.ts
  • frontend/src/app/login/login.ts
  • frontend/src/app/registration/registration.css
  • frontend/src/app/registration/registration.ts
  • frontend/src/app/remote-sign-in/remote-sign-in.ts
  • frontend/src/app/shared/components/app-shell/app-shell.html
  • frontend/src/app/shared/components/app-shell/app-shell.ts
  • frontend/src/app/stages/stage-setup.html
  • frontend/src/app/stages/stage-setup.ts
  • frontend/src/app/teams/team-management.html
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/kwila-ui-buttons:feature/kwila-ui-buttons
git switch feature/kwila-ui-buttons

Merge

Merge the changes and update on Forgejo.
git switch main
git merge --no-ff feature/kwila-ui-buttons
git switch feature/kwila-ui-buttons
git rebase main
git switch main
git merge --ff-only feature/kwila-ui-buttons
git switch feature/kwila-ui-buttons
git rebase main
git switch main
git merge --no-ff feature/kwila-ui-buttons
git switch main
git merge --squash feature/kwila-ui-buttons
git switch main
git merge --ff-only feature/kwila-ui-buttons
git switch main
git merge feature/kwila-ui-buttons
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
kwila/tournaments!82
No description provided.