Modify the solution to Conflicts on Non-textual Files challenge so that it is more consistent with the intended behavior#1125
Merged
Conversation
…at is is more consistent in intended behavior When trying to keep both images in this challenge, the original solution suggests using "git mv" for renaming one conflicted image file, but only "mv" for another. Using "mv" in both cases will be more consistent and still correct, while preventing git from auto-resolving the conflict and barring a "git checkout" navigation to the alternate path -- it happens sometimes. The original solution should still work in some cases, but the updated solution should work in all cases.
🆗 Pre-flight checks passed 😃This pull request has been checked and contains no modified workflow files, spoofing, or invalid commits. It should be safe to Approve and Run the workflows that need maintainer approval. |
Contributor
|
Great catch! Thank you for your contribution :-) |
github-actions Bot
pushed a commit
that referenced
this pull request
Jun 18, 2026
Auto-generated via `{sandpaper}`
Source : fc3f76a
Branch : main
Author : erinmgraham <erin.graham@jcu.edu.au>
Time : 2026-06-18 01:41:44 +0000
Message : Merge pull request #1125 from Zhuminem/patch-1
Modify the solution to Conflicts on Non-textual Files challenge so that it is more consistent with the intended behavior
github-actions Bot
pushed a commit
that referenced
this pull request
Jun 18, 2026
Auto-generated via `{sandpaper}`
Source : 74ab884
Branch : md-outputs
Author : GitHub Actions <actions@github.com>
Time : 2026-06-18 01:43:46 +0000
Message : markdown source builds
Auto-generated via `{sandpaper}`
Source : fc3f76a
Branch : main
Author : erinmgraham <erin.graham@jcu.edu.au>
Time : 2026-06-18 01:41:44 +0000
Message : Merge pull request #1125 from Zhuminem/patch-1
Modify the solution to Conflicts on Non-textual Files challenge so that it is more consistent with the intended behavior
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.
When trying to keep both images in this challenge, the original solution suggests using "git mv" for renaming one conflicted image file, but only "mv" for another.
Using "mv" in both cases will be more consistent and still correct, while preventing git from auto-resolving the conflict and barring a "git checkout" navigation to the alternate path -- it happens sometimes.
The original solution should still work in some cases, but the updated solution should work in all cases.