fix: Show colorized unified diff in script pull before overwrite prompt#215
Open
sveneberth wants to merge 1 commit intoviur-framework:mainfrom
Open
fix: Show colorized unified diff in script pull before overwrite prompt#215sveneberth wants to merge 1 commit intoviur-framework:mainfrom
script pull before overwrite prompt#215sveneberth wants to merge 1 commit intoviur-framework:mainfrom
Conversation
…ompt Replace hash-based comparison with difflib to fix a bug where differing line endings (\n vs \r\n) between local and server caused every script to appear changed. splitlines() normalizes line endings before comparing. Additionally, a colored server→local diff is now shown before asking the user whether to overwrite. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
sveneberth
added
bug
sveneberth
force-pushed
the
fix/script-pull-diff
branch
from
0effc0f to
a8814a2
Compare
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.
Replace hash-based comparison with
difflibto fix a bug where differing line endings (\nvs\r\n) between local and server caused every script to appear changed.splitlines()normalizes line endings before comparing. Additionally, a colored server→local diff is now shown before asking the user whether to overwrite.