Skip to content

Conversation

@TaraOverfield
Copy link
Contributor

@TaraOverfield TaraOverfield commented Dec 18, 2024

@marklio
Copy link

marklio commented Dec 19, 2024

@gewarren I'd like to merge this since Tara is OOF for the holidays. Does this repo have a preference for merge types (squash vs. merge)?

@marklio marklio merged commit 3a32e42 into main Dec 19, 2024
8 checks passed
@marklio marklio deleted the TaraO-11D-24-Revision1 branch December 19, 2024 20:00
@marklio
Copy link

marklio commented Dec 19, 2024

I chose squashed based on history, but it may be a good idea to configure the repo for what you want. :)

@gewarren
Copy link
Contributor

@gewarren I'd like to merge this since Tara is OOF for the holidays. Does this repo have a preference for merge types (squash vs. merge)?

Squash is preferred. It's configured as an option in this repo. Is there some other config we should set?

@marklio
Copy link

marklio commented Dec 19, 2024

You can disallow merge commits if you don't want them. You can also turn on linear history requirements on protected branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants