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

phash #17

Open
ariannabi wants to merge 2 commits from ariannabi/2024-heraklion-git:phash into main
pull from: ariannabi/2024-heraklion-git:phash
merge into: ASPP:main
Conversation 0 Commits 2 Files changed 1 +10 -2
ariannabi commented 2024-08-26 14:35:56 +02:00
Member
Copy link
No description provided.
ariannabi added 2 commits 2024-08-26 14:35:56 +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 phash:ariannabi-phash
git checkout ariannabi-phash

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff ariannabi-phash
git checkout main
git merge --ff-only ariannabi-phash
git checkout ariannabi-phash
git rebase main
git checkout main
git merge --no-ff ariannabi-phash
git checkout main
git merge --squash ariannabi-phash
git checkout main
git merge --ff-only ariannabi-phash
git checkout main
git merge ariannabi-phash
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#17
No description provided.
Delete branch "ariannabi/2024-heraklion-git:phash"

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?