La_Bureautique
/
zeg1jeux
2
2
Fork 3
Code Issues 2 Pull Requests 2 Packages Projects Releases Wiki Activity

$_SESSION['player_ipns'] #5

Open
qo-op wants to merge 2 commits from qo-op/zeg1jeux:fred into main
pull from: qo-op/zeg1jeux:fred
merge into: La_Bureautique:main
Conversation 2 Commits 2 Files Changed 3 +200 -190
qo-op commented 2022-11-15 21:42:38 +01:00
First-time contributor
Copy Link
No description provided.
qo-op added 1 commit 2022-11-15 21:42:38 +01:00
Boris commented 2022-11-15 21:44:27 +01:00
Owner
Copy Link

Please use tabs

[Please use tabs](https://www.youtube.com/watch?v=SsoOG6ZeyUI)
qo-op added 1 commit 2023-03-14 14:19:47 +01:00
qo-op commented 2023-03-14 14:24:20 +01:00
Author
First-time contributor
Copy Link

Allez... On va pas forker à cause des 'tab'

Allez... On va pas forker à cause des 'tab'
This pull request has changes conflicting with the target branch.
  • home.php
  • lib/Fred.class.php
  • login.php
You can also view command line instructions.

Step 1:

From your project repository, check out a new branch and test the changes.
git checkout -b qo-op-fred main
git pull fred

Step 2:

Merge the changes and update on Gitea.
git checkout main
git merge --no-ff qo-op-fred
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
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: La_Bureautique/zeg1jeux#5
No description provided.
Delete Branch "qo-op/zeg1jeux:fred"

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?