Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 7, 2026

* ACE/bin/MakeProjectCreator/config/acedefaults.mpb:<hr>This is an automatic backport of pull request #2498 done by [Mergify](https://mergify.com).

    * ACE/bin/MakeProjectCreator/config/acedefaults.mpb:

(cherry picked from commit 6c26ad0)

# Conflicts:
#	ACE/bin/MakeProjectCreator/config/acedefaults.mpb
@mergify mergify bot added the conflicts label Jan 7, 2026
@mergify
Copy link
Author

mergify bot commented Jan 7, 2026

Cherry-pick of 6c26ad0 has failed:

On branch mergify/bp/master/pr-2498
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 6c26ad0255.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ACE/bin/MakeProjectCreator/config/acedefaults.mpb

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jan 7, 2026

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Comment @coderabbitai help to get the list of available commands and usage tips.

@jwillemsen jwillemsen closed this Jan 7, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

2 participants