misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Rolle | MAS #2

Draft
roydfalk wants to merge 22 commits from dev-mas into main
pull from: dev-mas
merge into: misc:main
Conversation 0 Commits 22 Files changed 35 +876 -3
roydfalk commented 2024-10-13 11:44:42 +02:00
Owner
Copy link
No description provided.
roydfalk added 1 commit 2024-10-13 11:44:42 +02:00
roydfalk added 1 commit 2024-10-17 17:36:50 +02:00
roydfalk added 2 commits 2024-10-17 18:07:23 +02:00
roydfalk added 2 commits 2024-10-17 18:35:07 +02:00
roydfalk added 1 commit 2024-10-17 18:36:36 +02:00
roydfalk added 1 commit 2024-10-17 18:45:50 +02:00
roydfalk added 1 commit 2024-10-17 18:48:55 +02:00
roydfalk added 1 commit 2024-10-17 18:52:54 +02:00
roydfalk added 1 commit 2024-10-17 18:55:19 +02:00
roydfalk added 3 commits 2024-10-17 19:29:35 +02:00
roydfalk added 1 commit 2024-10-17 20:20:13 +02:00
roydfalk added 1 commit 2024-10-17 20:22:49 +02:00
roydfalk added 1 commit 2024-10-17 20:24:58 +02:00
roydfalk added 1 commit 2024-10-17 21:08:16 +02:00
roydfalk added 1 commit 2024-10-17 23:15:14 +02:00
roydfalk added 1 commit 2024-10-18 08:46:20 +02:00
roydfalk added 1 commit 2024-10-24 18:23:00 +02:00
roydfalk added 1 commit 2024-10-25 10:16:06 +02:00
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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 dev-mas
git checkout dev-mas
git rebase main
git checkout main
git merge --ff-only dev-mas
git checkout dev-mas
git rebase main
git checkout main
git merge --no-ff dev-mas
git checkout main
git merge --squash dev-mas
git checkout main
git merge --ff-only dev-mas
git checkout main
git merge dev-mas
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: misc/ansible-base#2
No description provided.
Delete branch "dev-mas"

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?