AFPy/python-docs-fr
AFPy
/
python-docs-fr
5
6
Fork 44
Code Issues 22 Pull Requests 14 Projects Releases Wiki Activity

Make merge #160

Closed
deronnax wants to merge 2 commits from deronnax/python-docs-fr:make_merge into 3.11
pull from: deronnax/python-docs-fr:make_merge
merge into: AFPy:3.11
Conversation 6 Commits 2 Files Changed 256 +18243 -8697
deronnax commented 2023-06-23 08:35:40 +00:00
Collaborator
Copy Link

je me suis permis d'ajouter "hex" et "punycode" au dict.

je me suis permis d'ajouter "hex" et "punycode" au `dict`.
deronnax force-pushed make_merge from 79225fe9a9 to ef8916f145 2023-06-23 10:53:08 +00:00 Compare
deronnax added 1 commit 2023-06-23 20:06:10 +00:00
ci/woodpecker/pr/woodpecker Pipeline was successful Details
fef746cef8
ajoute "hex" et "punycode" au dict"
ChristopheNan commented 2023-06-24 08:55:36 +00:00
Collaborator
Copy Link

J'ai une petite dizaine de PR en attente. Fusionner ce make merge va générer des conflits dans ces PR.
Tu as une urgence à faire cette fusion ?

J'ai une petite dizaine de PR en attente. Fusionner ce *make merge* va générer des conflits dans ces PR. Tu as une urgence à faire cette fusion ?
deronnax commented 2023-06-25 08:36:39 +00:00
Author
Collaborator
Copy Link

Hello. Pas du tout, donc pas de soucis.

Hello. Pas du tout, donc pas de soucis.
deronnax commented 2023-07-16 13:55:32 +00:00
Author
Collaborator
Copy Link

@ChristopheNan je peux refaire mon make merge après la fusion de #161 ?

@ChristopheNan je peux refaire mon `make merge` après la fusion de #161 ?
ChristopheNan commented 2023-07-17 19:56:54 +00:00
Collaborator
Copy Link

Je pense que le plus simple sera de repartir d'un make merge à partir de la nouvelle HEAD.

Je pense que le plus simple sera de repartir d'un ``make merge`` à partir de la nouvelle HEAD.
deronnax commented 2023-07-17 20:53:11 +00:00
Author
Collaborator
Copy Link

ah oui bien sûr c'était impliqué

ah oui bien sûr c'était impliqué
deronnax commented 2023-07-18 15:25:43 +00:00
Author
Collaborator
Copy Link

refaite dans #170.

refaite dans #170.
mdk closed this pull request 2023-07-18 21:53:41 +00:00
deronnax referenced this issue from a commit 2023-07-23 20:51:34 +00:00
Make merge (#170)
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details

Pull request closed

Please reopen this pull request to perform a merge.
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

  
meta

Pour les issues à propos du repo, de l'organisation, ...

  
question

More information is needed

  
wontfix

This won't be fixed

No Label
bug
duplicate
enhancement
help wanted
invalid
meta
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
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: AFPy/python-docs-fr#160
No description provided.
Delete Branch "deronnax/python-docs-fr:make_merge"

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?