Update pull_request_template.md

[GregoryPost]

Description

Document workflow for hotfix branch

Pull Request Checklist:

Pre-Approval

• There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
• Hotfixes should be branched off of the master branch and squash and merged into the hotfix branch.
• Features and backlog bugs should be merged into the Development branch, NOT master
• All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
• There are no linter errors
• New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
• Symbiota coding standards have been followed
• If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
• Comment which GitHub issue(s), if any does this PR address
• If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

• It is the code author's responsibility to merge their own pull request after it has been approved
• If this PR represents a merge into the Development branch, remember to use the squash & merge option
• If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
• If this PR represents a hotfix into the master branch, a subsequent PR from master into Development should be made merge option (i.e., no squash).
• If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
• Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

[egbot]

We should discuss this at our next dev meeting. Individual hotfixes rarely involve more than a commit or two, and thus probably don't need to be squashed when merged into 'hotfix', especially because the final hotfix will be squash merged into 'master'. But maybe better to discuss as a group.

[GregoryPost]

I am good with changing the language to a normal merge. I think I was confused about what we had discussed. Now that you mention it I agree that a normal merge is better as it allows for for individual commit cherry picking / rollbacks prior to merging the hotfix branch into master - when it will be squashed.

[Atticus29]

Requested one logic and one typo fix.

[Atticus29]

Just, squash here as well, right?

[egbot]

Just merge into the hotfix branch, since the hotfix branch will be eventually Squash & Merged into Master. We don't need to Squash Merge twice.

[Atticus29]

Typo with immediately here.