PastaPastaPasta 37c801c0a3 ci: add ci for merging into master (#5316) ... ## Issue being fixed or feature implemented This adds a check that ensures branches merge cleanly into master via a ff-only ## What was done? Added a GitHub action created via gpt-4 :) ## How Has This Been Tested? https://github.com/PastaPastaPasta/dash/actions/runs/4703432752/jobs/8341923994 and https://github.com/PastaPastaPasta/dash/actions/runs/4703457936/jobs/8341980146 for expected pass and expected fail ## Breaking Changes None, should be back ported to v19.x branch when we get the chance. ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation **For repository code-owners and collaborators only** - [x] I have assigned this pull request to a milestone		2023-05-22 08:37:03 -05:00
..
ISSUE_TEMPLATE	Dashification	2021-07-14 18:46:13 -05:00
workflows	ci: add ci for merging into master (#5316)	2023-05-22 08:37:03 -05:00
ISSUE_TEMPLATE.md	Merge #15038: docs: Get more info about GUI-related issue on Linux	2021-08-24 14:30:24 -04:00
PULL_REQUEST_TEMPLATE.md	style: adjust template of new PR (#5193)	2023-02-12 21:15:23 -06:00