installer: refine git pull behavior text to prevent misconfiguration#682
Open
JZBAKH wants to merge 1 commit intogit-for-windows:mainfrom
Open
installer: refine git pull behavior text to prevent misconfiguration#682JZBAKH wants to merge 1 commit intogit-for-windows:mainfrom
JZBAKH wants to merge 1 commit intogit-for-windows:mainfrom
Conversation
The previous phrasing of the git pull behavior options lacked explicit mechanical descriptions, potentially leading to unintended configurations of the pull.rebase and pull.ff parameters. This commit refactors the descriptive strings in install.iss to use explicit commit graph representations (e.g., [Local] + [Remote]). It also updates the page subtitle and appends a clarification note about line conflicts to prevent working tree corruption and align with upstream defaults. Signed-off-by: Jason Zbakh <jzbakh@gmail.com>
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
1 participant
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.
Description
The previous phrasing of the
git pullbehavior defaults could lead to unintended configurations of thepull.rebasevspull.ffparameters in the global.gitconfig. This PR refactors the text to introduce strict mechanical representations of the git state machine. The goal is to reduce ambiguity concerning commit graph resolution and align the UI text with current upstream defaults.Technical Scope
CreatePageandCreateRadioButtonfunctions for theGP_GitPullMerge,GP_GitPullRebase, andGP_GitPullFFOnlyoptions.TLabel(LblInfo) was added at the bottom of the page to clarify how Git handles file conflicts.ReplayChoice), or silent install vectors were altered. The internal component IDs remain untouched.Visual Regression Testing
Signed-off-by: Jason Zbakh jzbakh@gmail.com