Zoz/plex_fr_discord_repo
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

suggestion d'organisation #3

Merged
Zoz merged 2 commits from Benj into master 2021-02-25 23:36:48 +01:00
Conversation 3 Commits 2 Files Changed -
Benj commented 2021-02-25 23:05:32 +01:00
Collaborator
Copy Link

Voici une petite suggestion d'organisation
A discuter entre nous ;)

Voici une petite suggestion d'organisation A discuter entre nous ;)
Benj added 1 commit 2021-02-25 23:05:32 +01:00
suggestion d'organisation bd382946a6
Zoz commented 2021-02-25 23:19:11 +01:00
Owner
Copy Link

C est trop cooll on peu commenter, le mec c est chauffer

C est trop cooll on peu commenter, le mec c est chauffer
🚀 3
Zoz commented 2021-02-25 23:25:26 +01:00
Owner
Copy Link

editor.merge_conflict

editor.merge_conflict_summary

CONFLICT (file location): Exemples docker-compose/plex_et_tautulli/docker-compose.yml added in HEAD inside a directory that was renamed in tracking, suggesting it should perhaps be moved to ZZ_Exemples/plex_et_tautulli/docker-compose.yml.
Automatic merge failed; fix conflicts and then commit the result.

REFUSER!!!!

editor.merge_conflict editor.merge_conflict_summary CONFLICT (file location): Exemples docker-compose/plex_et_tautulli/docker-compose.yml added in HEAD inside a directory that was renamed in tracking, suggesting it should perhaps be moved to ZZ_Exemples/plex_et_tautulli/docker-compose.yml. Automatic merge failed; fix conflicts and then commit the result. REFUSER!!!!
Benj added 1 commit 2021-02-25 23:34:50 +01:00
Merge branch 'master' into Benj 80e3b78ee4
Benj commented 2021-02-25 23:36:39 +01:00
Author
Collaborator
Copy Link

Fini les conflits on se calme ! :P
Ready to merge

Fini les conflits on se calme ! :P Ready to merge
Zoz merged commit 9434a2977b into master 2021-02-25 23:36:48 +01:00
Benj deleted branch Benj 2021-02-25 23:57:46 +01:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
Aidez-moi !
J'ai besoin d'aide...
 Amélioration
Amélioration de fonctionnalités existantes
 Bug
Quelque chose ne fonctionne pas correctement
 Correction de Bug
Correction de bug
 Doublon
Ce ticket ou cette demande d'ajout existe déjà
 Nouveauté(s)
De nouvelles choses
 Question
J'ai besoin de plus d'informations...
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Benj Merry NightPumpkin Razor_AMG ToTo gigidsss Zoz
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Zoz/plex_fr_discord_repo#3
Delete Branch "Benj"

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?