Skip to content

Conversation

@nglgzz
Copy link

@nglgzz nglgzz commented Aug 13, 2019

Added a base configuration for Kodiak to auto-merge PRs that have been approved and that passed CI checks.

@nikivdev
Copy link
Member

Will it squash and merge the PR?

@nikivdev
Copy link
Member

I think it would be good to have a history like in https://github.com/gatsbyjs/gatsby/commits/master

Where all commits are squashed merges with commit name as PR name (#<number>) and description as PR description + list of commits perhaps.

What do you think?

@nglgzz
Copy link
Author

nglgzz commented Aug 13, 2019

It will rebase and merge. Just realized that this option is disabled in this repo though. Will update to squash instead.

Yeah definitely, that would be cool, will look into it.

@nglgzz
Copy link
Author

nglgzz commented Aug 13, 2019

Updated

nglgzz and others added 2 commits August 13, 2019 10:24
Co-Authored-By: John Letey <[email protected]>
Co-Authored-By: John Letey <[email protected]>
jletey
jletey previously approved these changes Aug 13, 2019
Copy link

@jletey jletey left a comment

Choose a reason for hiding this comment

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

LGTM @nglgzz ... just have one more whitespace suggestion 😆

Co-Authored-By: John Letey <[email protected]>
@nglgzz
Copy link
Author

nglgzz commented Aug 13, 2019

Fixed, need to approve again 😄

@nglgzz nglgzz merged commit c214a5d into master Aug 13, 2019
@nglgzz nglgzz deleted the kodiak branch August 13, 2019 08:48
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.

4 participants