DGNum/eleves.dgnum.eu
14
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Reorganisé pour rendre plus pratique à utiliser #2

Open
lbailly wants to merge 3 commits from lbailly/www.eleves.ens.fr:main into main
pull from: lbailly/www.eleves.ens.fr:main
merge into: DGNum:main
Conversation 1 Commits 3 Files changed 3 +360 -290
lbailly commented 2024-01-17 14:43:50 +01:00
Member
Copy link
No description provided.
lbailly added 3 commits 2024-01-17 14:43:50 +01:00
lbailly commented 2024-01-17 14:45:10 +01:00
Author
Member
Copy link

Ah je viens de voir que t'avais fait des trucs x(

Ah je viens de voir que t'avais fait des trucs x(
This pull request has changes conflicting with the target branch.
  • www/en/index.html
  • www/fr/index.html
View command line instructions

Checkout

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

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 lbailly-main
git checkout lbailly-main
git rebase main
git checkout main
git merge --ff-only lbailly-main
git checkout lbailly-main
git rebase main
git checkout main
git merge --no-ff lbailly-main
git checkout main
git merge --squash lbailly-main
git checkout main
git merge --ff-only lbailly-main
git checkout main
git merge lbailly-main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: DGNum/eleves.dgnum.eu#2
No description provided.
Delete branch "lbailly/www.eleves.ens.fr:main"

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?