Fix badly resolved merge conflicts from PR #4 - #5
Merged
Conversation
The merge of gifify-init into main incorrectly spliced old code into the rewritten files: - install.sh: old download/zsh code mixed into do_uninstall(), do_install() body replaced - gifify.sh: argument parsing loop removed, duplicate variable declarations - README.md: wrong title, old content appended after License section Restores the correct versions from the gifify-init branch. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.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.
Summary
gifify.sh— argument parsing loop,fpsvariable, no duplicate declarationsinstall.sh— cleando_uninstall()/do_install()functions, no old spliced codeREADME.md— proper# gififytitle, no old content appended after LicenseThe merge of PR #4 (gifify-init → main) incorrectly resolved conflicts by mixing old code into the rewritten files.
Test plan
shellcheck gifify.sh install.shpasses cleanbash gifify.sh --helpshows usagebash gifify.sh --versionshows1.1.0bash gifify.sh nonexistent.mp4shows error./install.shinstalls correctly./install.sh --uninstallremoves cleanly