doa/api
7
0
Fork
You've already forked api
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix ip address format #5

Open
zhaoyujie wants to merge 1 commit from fix/ipv6 into main
pull from: fix/ipv6
merge into: doa:main
Conversation 0 Commits 1 Files changed 3 +6 -7
zhaoyujie commented 2026-01-19 03:27:26 +00:00 (Migrated from gitea.internetapi.cn)
Copy link
No description provided.
This pull request has changes conflicting with the target branch.
  • go/proto/doirp_v3/v1/element/hs_site.pb.go
  • js/proto/src/doirp_v3/v1/element/hs_site_pb.ts
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 fix/ipv6:fix/ipv6
git switch fix/ipv6

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

doa/api!5
No description provided.