Simplify startup logic. #267

Open
Varriount wants to merge 1 commit from Varriount/simplify-startup-logic into main
Varriount commented 2023-02-28 00:56:42 +01:00 (Migrated from github.com)
No description provided.
This pull request has changes conflicting with the target branch.
  • netbox_agent/cli.py
  • netbox_agent/virtualmachine.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin Varriount/simplify-startup-logic:Varriount/simplify-startup-logic
git checkout Varriount/simplify-startup-logic

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 Varriount/simplify-startup-logic
git checkout Varriount/simplify-startup-logic
git rebase main
git checkout main
git merge --ff-only Varriount/simplify-startup-logic
git checkout Varriount/simplify-startup-logic
git rebase main
git checkout main
git merge --no-ff Varriount/simplify-startup-logic
git checkout main
git merge --squash Varriount/simplify-startup-logic
git checkout main
git merge --ff-only Varriount/simplify-startup-logic
git checkout main
git merge Varriount/simplify-startup-logic
git push origin main
Sign in to join this conversation.
No description provided.