feat(ng-dev): add conditional autosquash merge strategy #3169
Conversation
alan-agius4
force-pushed
the
conditional-squash
branch
2 times, most recently
from
9400cf7 to
4528a64
Compare
alan-agius4
force-pushed
the
conditional-squash
branch
from
4528a64 to
2f25a04
Compare
alan-agius4
force-pushed
the
conditional-squash
branch
from
2f25a04 to
4f576d1
Compare
alan-agius4
force-pushed
the
conditional-squash
branch
3 times, most recently
from
bb5e914 to
30def70
Compare
Introduces a new conditional autosquash merge strategy. This strategy uses the autosquash merge strategy if the pull request contains fixup or squash commits, and the GitHub API merge strategy otherwise. This allows pull requests that do not need to be squashed to be closed as "merged" on GitHub, rather than "closed".
alan-agius4
force-pushed
the
conditional-squash
branch
from
30def70 to
fcf8702
Compare
josephperrott
left a comment
josephperrott
left a comment
There was a problem hiding this comment.
Overall its looking good, just want to make sure we are certain about the one if block.
| // Squash and Merge will create a single commit message and thus we can use the API to merge. | ||
| if ( | ||
| method === 'rebase-with-fixup' && | ||
| (pullRequest.needsCommitMessageFixup || (await this.hasFixupOrSquashCommits(pullRequest))) | ||
| ) { | ||
| return super.merge(pullRequest); | ||
| } | ||
|
|
There was a problem hiding this comment.
I don't know why but I just cannot parse this block to save my life.
I think we don't want to perform the merge immediately if it needs commit message fixing right?
There was a problem hiding this comment.
The comit fixing is handled in
which this class now extends from.There was a problem hiding this comment.
Oh I didn't realize/connect that it changed base classes.
|
This PR was merged into the repository. The changes were merged into the following branches:
|
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
2 participants
Introduces a new conditional autosquash merge strategy. This strategy uses the autosquash merge strategy if the pull request contains fixup or squash commits, and the GitHub API merge strategy otherwise.
This allows pull requests that do not need to be squashed to be closed as "merged" on GitHub, rather than "closed".