Skip to content

test: basic tests for controllers/queries (backport #27422)#46121

Closed
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27422
Closed

test: basic tests for controllers/queries (backport #27422)#46121
mergify[bot] wants to merge 1 commit intoversion-13-hotfixfrom
mergify/bp/version-13-hotfix/pr-27422

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 25, 2025

(cherry picked from commit 62fc544)

# Conflicts:
#	erpnext/controllers/queries.py
#	erpnext/controllers/tests/test_queries.py
@mergify mergify bot requested a review from deepeshgarg007 as a code owner February 25, 2025 00:12
@mergify mergify bot added the conflicts label Feb 25, 2025
@mergify mergify bot requested a review from rohitwaghchaure as a code owner February 25, 2025 00:12
@mergify
Copy link
Contributor Author

mergify bot commented Feb 25, 2025

Cherry-pick of 62fc544 has failed:

On branch mergify/bp/version-13-hotfix/pr-27422
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 62fc544280.
  (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:   erpnext/controllers/queries.py
	both added:      erpnext/controllers/tests/test_queries.py

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

@mergify mergify bot assigned ankush Feb 25, 2025
@ankush ankush closed this Feb 25, 2025
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 12, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant