Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitHub PR template - merge strategies #9453

Merged
merged 2 commits into from Aug 13, 2021

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Aug 7, 2021

Proposed changes

Add PR template section about merge strategy, setting squash merge as default.

Test methodology

Manual

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned gerhardol Aug 7, 2021
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only problem I have with this - we'll have each PR with "1 of 4 tasks completed".

It looks like GitHub has a new syntax for handling dropdowns - have a look at https://github.com/dotnet/docs/blob/main/.github/ISSUE_TEMPLATE/breaking-change.yml

  - type: dropdown
    id: version
    attributes:
      label: Merge strategy
      description: How would you suggest to merge your changes?
      options:
        - Squash merge
        - Rebase merge
        - Merge
        - TBD

@gerhardol
Copy link
Member Author

The only problem I have with this - we'll have each PR with "1 of 4 tasks completed".

It looks like GitHub has a new syntax for handling dropdowns - have a look at https://github.com/dotnet/docs/blob/main/.github/ISSUE_TEMPLATE/breaking-change.yml

Forms are not supported for PRs: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms

Will change to add a comment instead.

@gerhardol gerhardol requested a review from RussKie August 11, 2021 22:51
@RussKie RussKie merged commit d27b078 into gitextensions:master Aug 13, 2021
@ghost ghost added this to the 3.6 milestone Aug 13, 2021
@gerhardol gerhardol deleted the feature/pr-merge-strategy branch August 13, 2021 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants