Merged 0 commits into branch:
message displays when a non-Source Code change is made in github_automerge_feature
task
#3471
Labels
Describe the bug
When
github_automerge_feature
task runs inci_feature
on a parent feature branch, changes successfully make it to child branches, but the message in CLI logs looks something like this:I expect to see
Merged 1 commits
or greater in the log. This is misleading since a commit was indeed merged to child branches but the message suggests it wasn't.This does not always occur. There seems to be a pattern but I haven't figured it out.
Examples of when you get the unexpected message
Merged 0 commits
:Examples of when you get the expected
Merged 1 commits
(or more):.gitignore
Reproduction steps
feature/child-1
branchfeature/child-1__grandchild-1
andfeature/child-1__grandchild-2
branchesfeature/child-1
branch that runsci_feature
on mergesfeature/child-1__grandchild-1
feature/child-1__grandchild-1
intofeature/child-1
ci_feature
action to finishResult:
Merged 0 commits
Expected:
Merged 1 commits
Your CumulusCI and Python versions
CumulusCI version: 3.70.0 (/Users/julianjoseph/.local/bin/cci)
Python version: 3.10.0 (/Users/julianjoseph/.local/pipx/venvs/cumulusci/bin/python)
Operating System
Image: ubuntu-22.04 8 Version: 20221212.1
Windows environment
No response
CumulusCI installation method
pip
Error Gist
No response
Additional information
No response
The text was updated successfully, but these errors were encountered: