cyberia/capsul-flask
9
6
Fork 8
Code Issues 21 Pull requests 5 Projects Releases Wiki Activity

self-service-change-email #47

Open
forest wants to merge 7 commits from self-service-change-email into main
pull from: self-service-change-email
merge into: cyberia:main
Conversation 0 Commits 7 Files changed 16 +195 -24
forest commented 2023-03-24 17:34:14 +00:00
Owner
Copy link

Forests edits on #46

Forests edits on https://git.cyberia.club/cyberia/capsul-flask/pulls/46
forest added 5 commits 2023-03-24 17:34:16 +00:00
forest added 1 commit 2023-03-24 17:59:46 +00:00
forest added 1 commit 2023-03-24 18:00:53 +00:00
This pull request has changes conflicting with the target branch.
  • capsulflask/auth.py
  • capsulflask/templates/changelog.html
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin self-service-change-email:self-service-change-email
git checkout self-service-change-email

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff self-service-change-email
git checkout main
git merge --ff-only self-service-change-email
git checkout self-service-change-email
git rebase main
git checkout main
git merge --no-ff self-service-change-email
git checkout main
git merge --squash self-service-change-email
git checkout main
git merge --ff-only self-service-change-email
git checkout main
git merge self-service-change-email
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: cyberia/capsul-flask#47
No description provided.
Delete branch "self-service-change-email"

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?