fgweb/ory-kratos-front
3
0
Fork
You've already forked ory-kratos-front
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

feat: first edition #1

Open
zhaoweijie wants to merge 3 commits from feat/login into main
pull from: feat/login
merge into: fgweb:main
Conversation 0 Commits 3 Files changed 25 +6377 -3432
zhaoweijie commented 2022-10-11 01:37:07 +00:00 (Migrated from gitea.internetapi.cn)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • package.json
  • pnpm-lock.yaml
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feat/login:feat/login
git switch feat/login

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff feat/login
git switch feat/login
git rebase main
git switch main
git merge --ff-only feat/login
git switch feat/login
git rebase main
git switch main
git merge --no-ff feat/login
git switch main
git merge --squash feat/login
git switch main
git merge --ff-only feat/login
git switch main
git merge feat/login
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

fgweb/ory-kratos-front!1
No description provided.