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

Configuring Mergify #525

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Configuring Mergify #525

merged 2 commits into from
Jul 15, 2022

Conversation

Rlin232
Copy link
Contributor

@Rlin232 Rlin232 commented Jul 13, 2022

Signed-off-by: Rlin232 rlin@mitre.org

Signed-off-by: Rlin232 <rlin@mitre.org>
@Rlin232 Rlin232 linked an issue Jul 13, 2022 that may be closed by this pull request
Signed-off-by: Rlin232 <rlin@mitre.org>
@Rlin232 Rlin232 requested review from Amndeep7 and camdenmoors July 13, 2022 20:18
@aaronlippold
Copy link
Member

Should we default to a rebase default method vs a squash ? It would keep the tree cleaner. What do you all think?

@Rlin232
Copy link
Contributor Author

Rlin232 commented Jul 14, 2022

I think if we do a rebase only for the PR's with less than a set amount of commits it will be worth it. I seem to remember some PR's being massive, and not sure how helpful that would be for cleanliness if we do a rebase on that.

@Amndeep7
Copy link
Contributor

Doing rebase is actually not gonna be better imo since it'll introduce a lot of intermediary/broken commits into the primary branch. Usually for that branch you want to go from working commit to working commit. Unless we dramatically change our dev practices to focus on crafting good commits (i.e. most probably go back after the fact and rewrite the history of the pr), I would prefer squash. We can discuss this during standup if necessary, but for now I'm gonna merge it.

@Amndeep7 Amndeep7 merged commit 0291059 into main Jul 15, 2022
@Amndeep7 Amndeep7 deleted the 203-add-mergify branch July 15, 2022 15:59
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.

Add Mergify
3 participants