mg/homeserver
1
0
Fork 0
Code Issues 1 Pull requests 1 Activity Actions

fix renovate config for forgejo #170

Open
mg wants to merge 5 commits from fix_r into master
pull from: fix_r
merge into: mg:master
Conversation 0 Commits 5 Files changed 2 +16 -2
mg commented 2024-08-27 20:40:02 +02:00
Owner
Copy link
No description provided.
mg added 4 commits 2024-08-27 20:40:03 +02:00
fix r
All checks were successful
ansible-lint / ansible-lint (push) Successful in 23s
Details
gitleaks / gitleaks (push) Successful in 3s
Details
e6ce9fbfe2 
Signed-off-by: Michael Grote <michael.grote@posteo.de>
fix r
All checks were successful
ansible-lint / ansible-lint (push) Successful in 24s
Details
gitleaks / gitleaks (push) Successful in 3s
Details
fc530f010a 
Signed-off-by: Michael Grote <michael.grote@posteo.de>
r
All checks were successful
ansible-lint / ansible-lint (push) Successful in 23s
Details
gitleaks / gitleaks (push) Successful in 3s
Details
3efc2eb6ed 
Signed-off-by: Michael Grote <michael.grote@posteo.de>
changed Files: renovate.json
All checks were successful
ansible-lint / ansible-lint (push) Successful in 24s
Details
gitleaks / gitleaks (push) Successful in 3s
Details
ansible-lint / ansible-lint (pull_request) Successful in 22s
Details
gitleaks / gitleaks (pull_request) Successful in 3s
Details
3561976f9d 
Signed-off-by: Michael Grote <michael.grote@posteo.de>
mg changed title from r to fix renovate config for forgejo 2024-08-27 20:42:14 +02:00
All checks were successful
ansible-lint / ansible-lint (push) Successful in 24s
Details
gitleaks / gitleaks (push) Successful in 3s
Details
ansible-lint / ansible-lint (pull_request) Successful in 22s
Details
gitleaks / gitleaks (pull_request) Successful in 3s
Details
This pull request has changes conflicting with the target branch.
  • renovate.json
View command line instructions

Checkout

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

Merge

Merge the changes and update on Forgejo.
git checkout master
git merge --no-ff fix_r
git checkout master
git merge --ff-only fix_r
git checkout fix_r
git rebase master
git checkout master
git merge --no-ff fix_r
git checkout master
git merge --squash fix_r
git checkout master
git merge --ff-only fix_r
git checkout master
git merge fix_r
git push origin master
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: mg/homeserver#170
No description provided.
Delete branch "fix_r"

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?