micke/knotctl
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases 10 Packages Wiki Activity Actions

Fix openstack sync #11

Open
nyren wants to merge 1 commit from nyren/main into main
pull from: nyren/main
merge into: micke:main
Conversation 1 Commits 1 Files changed 1 +62 -89
nyren commented 2025-01-30 12:21:29 +01:00 (Migrated from code.smolnet.org)
Copy link

Add options to skip sync of IPv4 and/or IPv6 addresses.

Add options to skip sync of IPv4 and/or IPv6 addresses.
micke commented 2025-01-30 12:39:05 +01:00 (Migrated from code.smolnet.org)
Copy link

Sorry, but your pr clashed with a major refactor... Can you rebase your changes on current main?

Sorry, but your pr clashed with a major refactor... Can you rebase your changes on current main?
This pull request has changes conflicting with the target branch.
  • knotctl/__init__.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin nyren/main:nyren/main
git checkout nyren/main

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 checkout main
git merge --no-ff nyren/main
git checkout nyren/main
git rebase main
git checkout main
git merge --ff-only nyren/main
git checkout nyren/main
git rebase main
git checkout main
git merge --no-ff nyren/main
git checkout main
git merge --squash nyren/main
git checkout main
git merge --ff-only nyren/main
git checkout main
git merge nyren/main
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: micke/knotctl#11
No description provided.
Delete branch "nyren/main"

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?