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.

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

Merged
merged 2 commits into from
Nov 28, 2024
Merged

Add docs structure #51

merged 2 commits into from
Nov 28, 2024

Conversation

ribeiroth
Copy link
Collaborator

@ribeiroth ribeiroth commented Nov 18, 2024

Description

@ribeiroth ribeiroth linked an issue Nov 18, 2024 that may be closed by this pull request
@danctorres
Copy link
Collaborator

Cool stuff, but IMO, we can use the proposals directory instead of the agreements

@danctorres
Copy link
Collaborator

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 😄

@ribeiroth
Copy link
Collaborator Author

ribeiroth commented Nov 19, 2024

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

@danctorres
Copy link
Collaborator

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.

@ribeiroth
Copy link
Collaborator Author

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.
It all depends on how we want to tell the history. For example, I think it’s more useful to have a way to identify the issue in history rather than just the commit, especially when dealing with many business rules. I can see what changed with the commits, but why? Will I remember this in the future?
Your approach doesn’t provide that, although it may not be the case here, so we can give it a try anyway. But yeah, we should discuss this as a team before moving forward 😅

@ribeiroth ribeiroth force-pushed the 40-create-docs-folder-in-the-project branch from 7ecaef0 to b451126 Compare November 20, 2024 12:46
@danctorres
Copy link
Collaborator

It all depends on how we want to tell the history. For example, I think it’s more useful to have a way to identify the issue in history rather than just the commit, especially when dealing with many business rules. I can see what changed with the commits, but why? Will I remember this in the future?

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.
Here is a references of this discussion: https://stackoverflow.com/questions/20348629/what-are-the-advantages-of-keeping-linear-history-in-git

@ribeiroth
Copy link
Collaborator Author

It all depends on how we want to tell the history. For example, I think it’s more useful to have a way to identify the issue in history rather than just the commit, especially when dealing with many business rules. I can see what changed with the commits, but why? Will I remember this in the future?

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. Here is a references of this discussion: https://stackoverflow.com/questions/20348629/what-are-the-advantages-of-keeping-linear-history-in-git

Ah ok, my bad! I was looking for commits without PRs related 😅
I still thinking that depends on the situation, is not a universal true, but well is now rebased and let find out what work for us as a team

Copy link
Collaborator

@danctorres danctorres left a 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?

@ribeiroth
Copy link
Collaborator Author

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

@ribeiroth ribeiroth force-pushed the 40-create-docs-folder-in-the-project branch 2 times, most recently from de6a3ad to 5100543 Compare November 21, 2024 18:17
@ribeiroth ribeiroth linked an issue Nov 21, 2024 that may be closed by this pull request
@ribeiroth ribeiroth force-pushed the 40-create-docs-folder-in-the-project branch from 4020603 to 9730388 Compare November 21, 2024 18:56
@ribeiroth ribeiroth force-pushed the 40-create-docs-folder-in-the-project branch from 9730388 to fd0b48d Compare November 28, 2024 17:54
@ribeiroth ribeiroth merged commit 60ba2bb into main Nov 28, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Glossary of relevant terms for project Create Docs folder in the project
3 participants