bryancall opened a new pull request, #12993:
URL: https://github.com/apache/trafficserver/pull/12993

   ## Summary
   - Revert the temporary `.asf.yaml` change that enabled merge commits for the 
11-dev to master history-preserving merge.
   - Restore the normal setting by setting `merge: false`.
   - Clarify the comment to explicitly say this controls the merge commit 
button.
   
   ## Test plan
   - [x] Confirm `.asf.yaml` sets `enabled_merge_buttons.merge: false`
   - [x] Confirm comment reads `Disable merge commit button`


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to