Test failure on content #1

Open

willemtsade wants to merge 3 commits from test_ci_fail_match into master

pull from: test_ci_fail_match

merge into: arch-msx:master

arch-msx:master

arch-msx:test_ci_parallel_build

arch-msx:test_ci_fail_hang

arch-msx:test_ci_fail_boot

Conversation 0 Commits 3 Files changed 1 +1 -1

willemtsade commented 2024-06-23 17:01:22 +00:00

Owner

Copy link

No description provided.

willemtsade added 1 commit 2024-06-23 17:01:22 +00:00

Test failaire on content. 0caad97612

willemtsade added 1 commit 2024-06-23 23:25:58 +00:00

Merge branch 'master' into test_ci_fail_match 7c92990a9d

willemtsade added 1 commit 2024-06-24 12:08:39 +00:00

Merge branch 'master' into test_ci_fail_match ededd8e51e

willemtsade changed title from Test failaire on content. to Test failure on content 2024-06-24 12:10:33 +00:00

Some checks failed

Hide all checks

Run test asserts / Test-Asserts (pull_request) Failing after 3s

Details

This pull request has changes conflicting with the target branch.

• src/example/hello-sdcc-asm/hello.asm

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title Merge pull request 'Test failure on content' (#1) from test_ci_fail_match into master

Merge commit body Reviewed-on: https://code.distributedrebirth.love/arch-msx/msxbuild/pulls/1

Merge pull request 'Test failure on content' (#1) from test_ci_fail_match into master Reviewed-on: https://code.distributedrebirth.love/arch-msx/msxbuild/pulls/1 Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin test_ci_fail_match:test_ci_fail_match

git switch test_ci_fail_match

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 switch master

git merge --no-ff test_ci_fail_match

git switch test_ci_fail_match

git rebase master

git switch master

git merge --ff-only test_ci_fail_match

git switch test_ci_fail_match

git rebase master

git switch master

git merge --no-ff test_ci_fail_match

git switch master

git merge --squash test_ci_fail_match

git switch master

git merge --ff-only test_ci_fail_match

git switch master

git merge test_ci_fail_match

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

Subscribe

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

arch-msx/msxbuild!1

No description provided.