ASPP/2024-heraklion-git
9
0
Fork 24
Code Issues 2 Pull requests 15 Actions Packages Projects Releases Wiki Activity

fix privacy leak in add_user #19

Open
romaingu wants to merge 1 commit from romaingu/2024-heraklion-git:fpl into main
pull from: romaingu/2024-heraklion-git:fpl
merge into: ASPP:main
Conversation 0 Commits 1 Files changed 1 +1 -1
romaingu commented 2024-08-26 14:48:43 +02:00
Member
Copy link
No description provided.
romaingu added 1 commit 2024-08-26 14:48:43 +02:00
This pull request has changes conflicting with the target branch.
  • auth.py
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff romaingu-fpl
git checkout main
git merge --ff-only romaingu-fpl
git checkout romaingu-fpl
git rebase main
git checkout main
git merge --no-ff romaingu-fpl
git checkout main
git merge --squash romaingu-fpl
git checkout main
git merge --ff-only romaingu-fpl
git checkout main
git merge romaingu-fpl
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
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: ASPP/2024-heraklion-git#19
No description provided.
Delete branch "romaingu/2024-heraklion-git:fpl"

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?