Using PR Merge Process - Part 4

[Glenn Adams <gl...@skynav.com>]

4. Once checks have completed successfully, possibly requiring additional
edit/commit/check iterations to fix problems, we can either *Squash and
merge* or *Rebase and merge*. The latter, *Rebase and merge*, is selected
using the triangle icon dropdown on the right of the green button shown
here. A rebase would be required, for example, if other commits had been
made to the main branch after the feature branch was created.

Here we don't need a rebase (and GH will tell you if it is required), so we
click on *Squash and merge*, which yields a confirmation screen where you
can add further comments and select the email to associate with the merge
commit (I have GPG keys for two emails):

[image: Screen Shot 2023-03-07 at 22.04.34.png]

Once confirmed, we have:

[image: Screen Shot 2023-03-07 at 22.05.09.png]

where we can choose to delete the (remote, upstream) feature branch, and
once deleted, we have:

[image: Screen Shot 2023-03-07 at 22.05.34.png]