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: timeout error while reposting (backport #31519) #31538

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 6, 2022

This is an automatic backport of pull request #31519 done by Mergify.
Cherry-pick of 78c8bb2 has failed:

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

You are currently cherry-picking commit 78c8bb251e.
  (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)

Changes to be committed:
	modified:   erpnext/stock/stock_ledger.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/stock_entry/test_stock_entry.py

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 78c8bb2)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py
@rohitwaghchaure rohitwaghchaure merged commit c4f39c7 into version-13-hotfix Jul 6, 2022
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-31519 branch July 6, 2022 09:04
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.35.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants