Closed jupierce closed 3 years ago
/lgtm /approve
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: jupierce, sjenning
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick release-4.7
@jupierce: #91 failed to apply on top of branch "release-4.7":
Applying: Permit "assembly.<name>" in release field of VERSION
Using index info to reconstruct a base tree...
M Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Permit "assembly.<name>" in release field of VERSION
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
If the Makefile comment is correct, I believe we can ignore the semver release field after
-4
or-gXXXXXXX
. This will make the operator less sensitive to future release naming changes.