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

Determine squashing policy when syncing from upstream fork #49

Closed
adikhoff opened this issue Oct 26, 2024 · 2 comments
Closed

Determine squashing policy when syncing from upstream fork #49

adikhoff opened this issue Oct 26, 2024 · 2 comments
Assignees
@adikhoff

Comments

@adikhoff
Copy link
Collaborator

adikhoff commented Oct 26, 2024 •
edited
Loading

We normally squash every PR but I think in this case we should keep the history intact.

Specifically referring to #44
@adikhoff adikhoff converted this from a draft issue Oct 26, 2024
@adikhoff adikhoff self-assigned this Oct 26, 2024
@Spartan322
Copy link
Member

It is necessary in fact for the merge from upstream not to be squashed in order to minimize conflicts and the chance git will complain. In every other case it should be squashed.

@adikhoff
Copy link
Collaborator Author

Thank you

@github-project-automation github-project-automation bot moved this from In progress to Done in Redot Docs Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@adikhoff adikhoff

Labels
None yet
Projects
Redot Docs
Status: Done
Milestone
No milestone
Development

No branches or pull requests
2 participants
@adikhoff @Spartan322