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

Fix some grammar in stacked branches page #51

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Fix some grammar in stacked branches page #51

merged 1 commit into from
Nov 26, 2024

Conversation

mtsgrd
Copy link
Contributor

@mtsgrd mtsgrd commented Nov 26, 2024

No description provided.

@mtsgrd mtsgrd requested a review from ndom91 as a code owner November 26, 2024 08:54
Copy link

vercel bot commented Nov 26, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Nov 26, 2024 9:54am

Copy link
Contributor

@ndom91 ndom91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few small notes, otherwise LGTM 👍

The main difference is that Virtual Branches are **independent** from one another, while stacked branches **depend** on the branch that precedes it.
Because of this, the two features are not mutually exclusive but rather complementary. For example a bugfix change that is unrelated to a feature being developed
can be put in a separate virtual branch. On the other hand a change that depends on a previous change can be put in a stacked branch above the one it depends on.
The main difference is that Virtual Branches are **independent** from one another, while stacked branches **depend** depend on the ones that come before it.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depend twice here now?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for spotting!


> The workflow below assumes a GitHub remote. If you are using a different forge, you can still use this functionality but will need to manually create/update the Pull/Merge Requests

1. Creating a new dependent branch forms a new stack within the virtual branch
1. Creating a new dependent branch forms a new stack within the virtual branch.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"forms a new branch within the lane", no?

@mtsgrd mtsgrd merged commit 5da8036 into main Nov 26, 2024
2 of 3 checks passed
@mtsgrd mtsgrd deleted the grammar-branch branch November 26, 2024 09:53
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.

2 participants