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: don't stop next unattached file from being attached (backport #21629) #23656

Closed

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 7, 2023

This is an automatic backport of pull request #21629 done by Mergify.
Cherry-pick of 638c9ea has failed:

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

You are currently cherry-picking commit 638c9ea5b9.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by us:   frappe/core/doctype/file/utils.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/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 638c9ea)

# Conflicts:
#	frappe/core/doctype/file/utils.py
…f first file is invalid

(cherry picked from commit 04f8d23)
@mergify mergify bot requested a review from a team as a code owner December 7, 2023 06:58
@mergify mergify bot added the conflicts label Dec 7, 2023
@mergify mergify bot requested review from ankush and removed request for a team December 7, 2023 06:58
@sagarvora sagarvora closed this Dec 7, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-21629 branch December 7, 2023 06:59
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 22, 2023
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.

None yet

2 participants