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.

Sign up for GitHub

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

Jump to bottom

Use traditional merges for feature branches but not main in MM #17961

Open
rileykarson opened this issue Apr 25, 2024 · 0 comments
Open

Use traditional merges for feature branches but not main in MM #17961

rileykarson opened this issue Apr 25, 2024 · 0 comments
Assignees
@rileykarson
Labels
size/xs technical-debt
Milestone
Near-Term Goals

Comments

@rileykarson
Copy link
Collaborator

What kind of contribution is this issue about?

Other (specify in details)

Details

We always want to squash on main to preserve a linear history, but feature branch syncs are nonlinear. We may be able to set a branch protection on main to enforce linear history & enable traditional merges against the repo.

References

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

@rileykarson rileykarson

Labels
size/xs technical-debt
Projects
None yet
Milestone
Near-Term Goals
Development

No branches or pull requests
1 participant
@rileykarson