-
Notifications
You must be signed in to change notification settings - Fork 19
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
Improve the stack branch command to handle trunk branches as parents #344
Conversation
Current Aviator status
This PR was merged using Aviator. Stack
See the real-time status of this PR on the
Aviator webapp.
Use the Aviator Chrome Extension
to see the status of your PR within GitHub.
|
FlexReview SummaryBased on the code complexity and the author's expertise score, these are the suggested reviewers:
See the list of alternate reviewers in the detailed breakdown below. Detailed BreakdownAuthor’s expertise score for the modified files:
† Indicates that the file doesn't need an expert review. (?) See full breakdown of the reviewers on the Aviator webapp. |
A few questions (user experience related):
|
Answered offline, but this is using the remote tracking branches, which is a local ref. It doesn't do any git-fetch.
This is consistent with av-stack-sync behavior.
I will update the error message. |
50ed0b8
to
31edd7d
Compare
93c82c9
to
175d2a8
Compare
When creating a new branch from a trunk branch, the stack branch command is better to start off from the remote tracking branch instead of the local branch. This way, the new branch will be created from the latest state of the trunk branch. While we are here, accept `origin/HEAD` as the parent branch name and resolve it to the default branch. Previously, this command automatically "adopts" the parent branch to av automatically, assuming that the parent branch's parent is the default branch, which might not be true. Instead, this command checks if the parent branch is already adopted or not.
175d2a8
to
e97fefb
Compare
When creating a new branch from a trunk branch, the stack branch command
is better to start off from the remote tracking branch instead of the
local branch. This way, the new branch will be created from the latest
state of the trunk branch.
While we are here, accept
origin/HEAD
as the parent branch name andresolve it to the default branch.
Previously, this command automatically "adopts" the parent branch to av
automatically, assuming that the parent branch's parent is the default
branch, which might not be true. Instead, this command checks if the
parent branch is already adopted or not.