-
Notifications
You must be signed in to change notification settings - Fork 0
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
Add docs structure #51
Conversation
Cool stuff, but IMO, we can use the proposals directory instead of the agreements |
Adding a commit fixing another commit is a little redundant. Can you squash them so that every commit is relevant, this is only has the intended changes. This helps keep the history cleaner and easier to follow 😄 |
@danctorres I usually squash when I merge a PR. Of course when we have a big PR is interesting do that, otherwise squash and merge works fine |
I understand your point. This is actually a nice discussion to have and establish a convention for our project, we can have it here. IMO, we want to avoid doing squash and merge or merge commits. Its better to squash it manually, push it, and then rebase and merge, since it makes it easier to review and to follow the history. We want to keep linear history and avoid creating artificial commits. Rebase and merge keeps a cleaner, more organized history and is better when we need to look back at the history. |
I understand that, if not used wisely, it could lead to some confusion or lack of clarity. |
7ecaef0
to
b451126
Compare
Im not sure that I understood your point. Your point is that we are not able to find the project issue with linear history? When we keep a linear history, we can see every commit, and with them we can find the PR that has the issue link. But we can also add the link to the issue in the commit description if necessary. But the underling discussion, why keep a linear history? It makes the main branch cleaner, it's easier to understand, to review and follow changes, if necessary we can easily revert or cherry-pick single commit, easier to find problems with bisect. Sometimes we need to take a look at single commits. With rebase we are sure that we are only changing what we intend, etc. |
Ah ok, my bad! I was looking for commits without PRs related 😅 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Quick question, do we need the glossary directory? Are going to have multiple files inside glossary?
Yes, I was thinking of having some files by theme |
de6a3ad
to
5100543
Compare
4020603
to
9730388
Compare
9730388
to
fd0b48d
Compare
Description