mad-star-studio/hub-site
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

main #2

Open
SevenOfAces wants to merge 11 commits from main into deploy
pull from: main
merge into: mad-star-studio:deploy
Conversation 0 Commits 11 Files changed 5 +12568 -1
SevenOfAces commented 2024-11-19 04:55:18 +00:00
Owner
Copy link
No description provided.
SevenOfAces added 11 commits 2024-11-19 04:55:18 +00:00
new file: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Failing after 43s
Details
c227b2ed78
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Failing after 3s
Details
484c958f8c
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Has been cancelled
Details
ab50b172f6 
modified:   package.json
new file: .forgejo/workflows/run-tests.sh
Some checks failed
Testing / test (push) Failing after 44s
Details
cd75367045 
modified:   .forgejo/workflows/test.yml
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Has been cancelled
Details
8baba8a426
deleted: .forgejo/workflows/run-tests.sh
Some checks failed
Testing / test (push) Failing after 50s
Details
f3bdec089b 
modified:   .forgejo/workflows/test.yml
	modified:   package.json
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Failing after 48s
Details
15b2b3162a
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (push) Has been cancelled
Details
928a952ca9 
modified:   package.json
modified: .forgejo/workflows/test.yml
Some checks failed
Testing / test (pull_request) Successful in 44s
Details
Testing / test (push) Failing after 2m31s
Details
36576a27f3
SevenOfAces closed this pull request 2024-11-19 05:07:41 +00:00
SevenOfAces reopened this pull request 2024-11-19 05:07:45 +00:00
Some checks failed
Testing / test (pull_request) Successful in 44s
Details
Testing / test (push) Failing after 2m31s
Details
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/test.yml
  • clusters/my-cluster/flux-system/gotk-sync.yaml
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin main:main
git checkout 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 deploy
git merge --no-ff main
git checkout main
git rebase deploy
git checkout deploy
git merge --ff-only main
git checkout main
git rebase deploy
git checkout deploy
git merge --no-ff main
git checkout deploy
git merge --squash main
git checkout deploy
git merge --ff-only main
git checkout deploy
git merge main
git push origin deploy
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: mad-star-studio/hub-site#2
No description provided.
Delete branch "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?