Replies: 1 comment 1 reply
-
Here's another supporting facts: I saw a lot of PR with commit comments like "update", "push", "u", etc. These stash-ish style of commit message is really meaning less for the whole view of master branch history. We can make greater comment in PR and the squash merge commit message all in once. |
Beta Was this translation helpful? Give feedback.
1 reply
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Background
Github support three merge methods:
For merge commit:
We will have a separate merge commit along with all commits in PR.
For rebase merging:
We will share the same history.
For squash merging:
We will merge the whole PR into a single commit.
For now, databend uses merge commit which makes it hard to track changes.
Propose
So I propose to use
squash merging
only for mering.Benefits:
Drawbacks:
But we can track that information in PR
This requires all contributors to start working from the
main
branch.Rationale
Why not rebase merging?
It's highly possible for contributors to force push their commits before merging. To an active community like databend, it's not affordable.
Beta Was this translation helpful? Give feedback.
All reactions