Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 29, 2025


This is an automatic backport of pull request #14459 done by [Mergify](https://mergify.com).

(cherry picked from commit 36674f1)

# Conflicts:
#	erlang.mk
Copy link
Author

mergify bot commented Aug 29, 2025

Cherry-pick of 36674f1 has failed:

On branch mergify/bp/v4.1.x/pr-14459
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit 36674f112.
  (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:   erlang.mk

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 added the make label Aug 29, 2025
@michaelklishin michaelklishin added this to the 4.1.5 milestone Aug 29, 2025
@michaelklishin michaelklishin changed the title Bump erlang.mk with 'gmake erlang-mk' (backport #14459) For 4.1.5: Bump erlang.mk with 'gmake erlang-mk' (backport #14459) Aug 29, 2025
@michaelklishin michaelklishin merged commit 13be983 into v4.1.x Sep 2, 2025
541 of 543 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.1.x/pr-14459 branch September 2, 2025 18:07
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.

1 participant