DGNum/ernestophone.ens.fr
6
0
Fork 0
Code Issues 7 Pull requests 3 Projects Releases Packages Wiki Activity Actions

Draft: Ajout commentaires #36

Open
mdebray wants to merge 3 commits from ajout_commentaires into master
pull from: ajout_commentaires
merge into: DGNum:master
Conversation 0 Commits 3 Files changed 1 +104 -53
mdebray commented 2021-12-26 16:20:38 +01:00 (Migrated from git.eleves.ens.fr)
Copy link

Je (Maurice) compte ajouter des commentaires au fur et à mesure que je parcours le code. Cette MR pourra permettre de review ce que je vais écrire.

Je (Maurice) compte ajouter des commentaires au fur et à mesure que je parcours le code. Cette MR pourra permettre de review ce que je vais écrire.
This pull request has changes conflicting with the target branch.
  • gestion/models.py
View command line instructions

Checkout

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

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

   
Good first issue

   
To Do
  
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
Doing
Good first issue
To Do
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/ernestophone.ens.fr#36
No description provided.
Delete branch "ajout_commentaires"

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?