BlahajTeam/next-app
3
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Finished animations #12

Open
graphite wants to merge 8 commits from graphite/animations2 into main AGit
pull from: graphite/animations2
merge into: BlahajTeam:main
Conversation 0 Commits 8 Files changed 12 +150 -52
graphite commented 2024-06-02 11:47:30 +03:00
Owner
Copy link
No description provided.
graphite added 8 commits 2024-06-02 11:47:30 +03:00 
Signed-off-by: Ioan Cristian CHELARU <iccjoc@proton.me>
Signed-off-by: Ioan Cristian CHELARU <iccjoc@proton.me>
fixed more merge conflicts
fixed merge conflicts
Signed-off-by: Alex Stan <alex.stan.2010@proton.me>
This pull request has changes conflicting with the target branch.
  • app/components/logo.tsx
  • app/components/question_component.tsx
  • app/components/results.tsx
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin +refs/pull/12/head:graphite/animations2
git checkout graphite/animations2

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff graphite/animations2
git checkout main
git merge --ff-only graphite/animations2
git checkout graphite/animations2
git rebase main
git checkout main
git merge --no-ff graphite/animations2
git checkout main
git merge --squash graphite/animations2
git checkout main
git merge --ff-only graphite/animations2
git checkout main
git merge graphite/animations2
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: BlahajTeam/next-app#12
No description provided.
Delete branch "graphite/animations2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?