Checkout a trunk instead of switching to the detached HEAD #273
Conversation
Current Aviator status
This PR was merged using Aviator.
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. |
internal/actions/sync_stack.go
Outdated
| return errors.Errorf("cannot switch to detached HEAD: %v", err) | ||
|
|
||
| if _, err := repo.CheckoutBranch(&git.CheckoutBranch{Name: br.Parent.Name}); err != nil { | ||
| return errors.Errorf("cannot checkout to parent branch %s: %v", br.Parent.Name, err) |
There was a problem hiding this comment.
You mentioned
Instead we should checkout trunk
in #246
Does "trunk' refer to something different from a 'parent branch' or same?
There was a problem hiding this comment.
Trunk is typically 'main' or 'master'. It'll be the root of those stacked branches.
There was a problem hiding this comment.
@draftcode Fixed. Please review when you're free.
Konboi
changed the title
Addressed #246