fix(stack-sync): cleanup rebase state on sync --abort#48
Merged
aviator-app[bot] merged 1 commit intomasterfrom Jul 26, 2022
Merged
Conversation
jainankit
approved these changes
Jul 25, 2022
| return errors.New("no sync in progress") | ||
| } | ||
|
|
||
| // Abort the rebase if we need to |
Contributor
There was a problem hiding this comment.
so previously the abort was a no-op? We were only clearing the state from the refs without actually updating any references?
Contributor
Author
There was a problem hiding this comment.
Yep, that's correct. 🙃 Kind of an obvious oversight in retrospect but hindsight is 20/20 😅
Contributor
Author
|
/aviator merge |
Contributor
Aviator status
This PR was merged using Aviator. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.