disable create branch menu item when dealing with rebase conflicts#7005
Merged
outofambit merged 2 commits intodevelopmentfrom Mar 4, 2019
Merged
Conversation
0a4fee8 to
ce0877f
Compare
Contributor
|
Tested and LGTM |
outofambit
approved these changes
Mar 4, 2019
Contributor
|
pulling this into 1.6.3 since its ready and low risk! |
tierninho
approved these changes
Mar 4, 2019
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
4 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.
Overview
A more targeted fix for #6994
Description
When you are in the middle of a rebase, Desktop should not let the user create a new branch as this is a potential source of confusion.
This wasn't blocked previously because the "detached HEAD" scenario is a way for users to create a new branch based on an arbitrary commit in the repository history.
Current
developmentbranchThis PR
Release notes
Notes: no-notes