Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 Fix gh merge command #1505

Merged
merged 1 commit into from
Dec 3, 2024
Merged

🐛 Fix gh merge command #1505

merged 1 commit into from
Dec 3, 2024

Conversation

czunker
Copy link
Contributor

@czunker czunker commented Dec 3, 2024

This should fix:
https://github.com/mondoohq/cnspec/actions/runs/12136947927/job/33839326646

only one of --merge, --rebase, or --squash can be enabled

Signed-off-by: Christian Zunker <[email protected]>
Copy link
Contributor

github-actions bot commented Dec 3, 2024

Test Results

  1 files  ±0   26 suites  ±0   17s ⏱️ -1s
490 tests ±0  489 ✅ ±0  1 💤 ±0  0 ❌ ±0 
491 runs  ±0  490 ✅ ±0  1 💤 ±0  0 ❌ ±0 

Results for commit 4318b06. ± Comparison against base commit 1cd2828.

@philipbalinov philipbalinov merged commit 44cd00b into main Dec 3, 2024
14 checks passed
@philipbalinov philipbalinov deleted the czunker/fix_merge branch December 3, 2024 11:30
@github-actions github-actions bot locked and limited conversation to collaborators Dec 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants