RedCrab/projet-nuitinfo-2024
8
0
Fork 0
generated from lucien/actix-react-template
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

chaos_page #14

Open
Buche wants to merge 7 commits from chaos_page into main
pull from: chaos_page
merge into: RedCrab:main
Conversation 0 Commits 7 Files changed 5 +124
Buche commented 2024-12-06 05:49:09 +00:00
Owner
Copy link
No description provided.
Buche added 6 commits 2024-12-06 05:49:10 +00:00
Buche added 1 commit 2024-12-06 05:49:29 +00:00
This pull request has changes conflicting with the target branch.
  • front/src/components/chaos/MonInput.tsx
  • front/src/components/chaos/monButton.tsx
  • front/src/components/chaos/style.css
  • front/src/pages/ChaosPage.tsx
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin chaos_page:chaos_page
git checkout chaos_page

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff chaos_page
git checkout chaos_page
git rebase main
git checkout main
git merge --ff-only chaos_page
git checkout chaos_page
git rebase main
git checkout main
git merge --no-ff chaos_page
git checkout main
git merge --squash chaos_page
git checkout main
git merge --ff-only chaos_page
git checkout main
git merge chaos_page
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: RedCrab/projet-nuitinfo-2024#14
No description provided.
Delete branch "chaos_page"

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?