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
Update cherrypick dialog #11158
Update cherrypick dialog #11158
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, have not run.
Great split of commits for reviewing.
(I updated the description, adding a table to see the changes more easily.)
Thank you. I plan to merge this in the next few days, unless there are objections. I'm currently doing a lot (and I mean a lot) of rebasing and cherry-picking. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, have not run
} | ||
|
||
private void SaveSettings() | ||
{ | ||
AppSettings.CommitAutomaticallyAfterCherryPick = AutoCommit.Checked; | ||
AppSettings.AddCommitReferenceToCherryPick = checkAddReference.Checked; | ||
if (DialogResult == DialogResult.OK) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would not add this condition. If changed, the user has clicked the CheckBoxes.
Sometimes, I need to close a dialog in order to lookup a detail and come back...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Closing the dialog is essentially aborting the process. In this case, it doesn't feel right to retain the selection.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changed order of tick boxes will take some time to get used to.
I didn't realise that I had those accidentally swapped. I'll change the order. Thanks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+0
Proposed changes
GitExtensionsDialog
and update the layout.Screenshots
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.