RubyGems - bash-merge - Versions diffs - 2.0.5 → 7.1.1 - Mend

bash-merge 2.0.5 → 7.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

checksums.yaml +4 -4
checksums.yaml.gz.sig +0 -0
data/LICENSE.md +13 -0
data/README.md +105 -670
data/lib/bash/merge/comment_tracker.rb +36 -100
data/lib/bash/merge/debug_logger.rb +10 -10
data/lib/bash/merge/emitter.rb +45 -33
data/lib/bash/merge/file_analysis.rb +133 -33
data/lib/bash/merge/freeze_node.rb +9 -9
data/lib/bash/merge/merge_result.rb +11 -5
data/lib/bash/merge/node_wrapper.rb +62 -36
data/lib/bash/merge/smart_merger.rb +641 -32
data/lib/bash/merge/version.rb +5 -4
data/lib/bash/merge.rb +116 -25
data/lib/bash-merge.rb +7 -1
data/sig/bash/merge.rbs +3 -255
data.tar.gz.sig +0 -0
metadata +85 -84
metadata.gz.sig +0 -0
data/CHANGELOG.md +0 -186
data/CITATION.cff +0 -20
data/CODE_OF_CONDUCT.md +0 -134
data/CONTRIBUTING.md +0 -227
data/FUNDING.md +0 -74
data/LICENSE.txt +0 -21
data/REEK +0 -0
data/RUBOCOP.md +0 -71
data/SECURITY.md +0 -21
data/lib/bash/merge/conflict_resolver.rb +0 -199

data/CONTRIBUTING.md DELETED Viewed

@@ -1,227 +0,0 @@
-# Contributing
-Bug reports and pull requests are welcome on [CodeBerg][📜src-cb], [GitLab][📜src-gl], or [GitHub][📜src-gh].
-This project should be a safe, welcoming space for collaboration, so contributors agree to adhere to
-the [code of conduct][🤝conduct].
-To submit a patch, please fork the project, create a patch with tests, and send a pull request.
-Remember to [![Keep A Changelog][📗keep-changelog-img]][📗keep-changelog] if you make changes.
-## Help out!
-Take a look at the `reek` list which is the file called `REEK` and find something to improve.
-Follow these instructions:
-1. Fork the repository
-2. Create a feature branch (`git checkout -b my-new-feature`)
-3. Make some fixes.
-4. Commit changes (`git commit -am 'Added some feature'`)
-5. Push to the branch (`git push origin my-new-feature`)
-6. Make sure to add tests for it. This is important, so it doesn't break in a future release.
-7. Create new Pull Request.
-## Executables vs Rake tasks
-Executables shipped by dependencies, such as kettle-dev, and stone_checksums, are available
-after running `bin/setup`. These include:
-- gem_checksums
-- kettle-changelog
-- kettle-commit-msg
-- kettle-dev-setup
-- kettle-dvcs
-- kettle-pre-release
-- kettle-readme-backers
-- kettle-release
-There are many Rake tasks available as well. You can see them by running:
-```shell
-bin/rake -T
-```
-## Environment Variables for Local Development
-Below are the primary environment variables recognized by stone_checksums (and its integrated tools). Unless otherwise noted, set boolean values to the string "true" to enable.
-General/runtime
-- DEBUG: Enable extra internal logging for this library (default: false)
-- REQUIRE_BENCH: Enable `require_bench` to profile requires (default: false)
-- CI: When set to true, adjusts default rake tasks toward CI behavior
-Coverage (kettle-soup-cover / SimpleCov)
-- K_SOUP_COV_DO: Enable coverage collection (default: true in .envrc)
-- K_SOUP_COV_FORMATTERS: Comma-separated list of formatters (html, xml, rcov, lcov, json, tty)
-- K_SOUP_COV_MIN_LINE: Minimum line coverage threshold (integer, e.g., 100)
-- K_SOUP_COV_MIN_BRANCH: Minimum branch coverage threshold (integer, e.g., 100)
-- K_SOUP_COV_MIN_HARD: Fail the run if thresholds are not met (true/false)
-- K_SOUP_COV_MULTI_FORMATTERS: Enable multiple formatters at once (true/false)
-- K_SOUP_COV_OPEN_BIN: Path to browser opener for HTML (empty disables auto-open)
-- MAX_ROWS: Limit console output rows for simplecov-console (e.g., 1)
-  Tip: When running a single spec file locally, you may want `K_SOUP_COV_MIN_HARD=false` to avoid failing thresholds for a partial run.
-GitHub API and CI helpers
-- GITHUB_TOKEN or GH_TOKEN: Token used by `ci:act` and release workflow checks to query GitHub Actions status at higher rate limits
-Releasing and signing
-- SKIP_GEM_SIGNING: If set, skip gem signing during build/release
-- GEM_CERT_USER: Username for selecting your public cert in `certs/<USER>.pem` (defaults to $USER)
-- SOURCE_DATE_EPOCH: Reproducible build timestamp.
-  - `kettle-release` will set this automatically for the session.
-  - Not needed on bundler >= 2.7.0, as reproducible builds have become the default.
-Git hooks and commit message helpers (exe/kettle-commit-msg)
-- GIT_HOOK_BRANCH_VALIDATE: Branch name validation mode (e.g., `jira`) or `false` to disable
-- GIT_HOOK_FOOTER_APPEND: Append a footer to commit messages when goalie allows (true/false)
-- GIT_HOOK_FOOTER_SENTINEL: Required when footer append is enabled — a unique first-line sentinel to prevent duplicates
-- GIT_HOOK_FOOTER_APPEND_DEBUG: Extra debug output in the footer template (true/false)
-For a quick starting point, this repository’s `.envrc` shows sane defaults, and `.env.local` can override them locally.
-## Appraisals
-From time to time the [appraisal2][🚎appraisal2] gemfiles in `gemfiles/` will need to be updated.
-They are created and updated with the commands:
-```console
-bin/rake appraisal:update
-```
-If you need to reset all gemfiles/*.gemfile.lock files:
-```console
-bin/rake appraisal:reset
-```
-When adding an appraisal to CI, check the [runner tool cache][🏃‍♂️runner-tool-cache] to see which runner to use.
-## The Reek List
-Take a look at the `reek` list which is the file called `REEK` and find something to improve.
-To refresh the `reek` list:
-```console
-bundle exec reek > REEK
-```
-## Run Tests
-To run all tests
-```console
-bundle exec rake test
-```
-### Spec organization (required)
-- One spec file per class/module. For each class or module under `lib/`, keep all of its unit tests in a single spec file under `spec/` that mirrors the path and file name exactly: `lib/bash/merge/my_class.rb` -> `spec/bash/merge/my_class_spec.rb`.
-- Exception: Integration specs that intentionally span multiple classes. Place these under `spec/integration/` (or a clearly named integration folder), and do not directly mirror a single class. Name them after the scenario, not a class.
-## Lint It
-Run all the default tasks, which includes running the gradually autocorrecting linter, `rubocop-gradual`.
-```console
-bundle exec rake
-```
-Or just run the linter.
-```console
-bundle exec rake rubocop_gradual:autocorrect
-```
-For more detailed information about using RuboCop in this project, please see the [RUBOCOP.md](RUBOCOP.md) guide. This project uses `rubocop_gradual` instead of vanilla RuboCop, which requires specific commands for checking violations.
-### Important: Do not add inline RuboCop disables
-Never add `# rubocop:disable ...` / `# rubocop:enable ...` comments to code or specs (except when following the few existing `rubocop:disable` patterns for a rule already being disabled elsewhere in the code). Instead:
-- Prefer configuration-based exclusions when a rule should not apply to certain paths or files (e.g., via `.rubocop.yml`).
-- When a violation is temporary, and you plan to fix it later, record it in `.rubocop_gradual.lock` using the gradual workflow:
-  - `bundle exec rake rubocop_gradual:autocorrect` (preferred)
-  - `bundle exec rake rubocop_gradual:force_update` (only when you cannot fix the violations immediately)
-As a general rule, fix style issues rather than ignoring them. For example, our specs should follow RSpec conventions like using `described_class` for the class under test.
-## Contributors
-Your picture could be here!
-[![Contributors][🖐contributors-img]][🖐contributors]
-Made with [contributors-img][🖐contrib-rocks].
-Also see GitLab Contributors: [https://gitlab.com/kettle-rb/bash-merge/-/graphs/main][🚎contributors-gl]
-## For Maintainers
-### One-time, Per-maintainer, Setup
-**IMPORTANT**: To sign a build,
-a public key for signing gems will need to be picked up by the line in the
-`gemspec` defining the `spec.cert_chain` (check the relevant ENV variables there).
-All releases are signed releases.
-See: [RubyGems Security Guide][🔒️rubygems-security-guide]
-NOTE: To build without signing the gem set `SKIP_GEM_SIGNING` to any value in the environment.
-### To release a new version:
-#### Automated process
-1. Update version.rb to contain the correct version-to-be-released.
-2. Run `bundle exec kettle-changelog`.
-3. Run `bundle exec kettle-release`.
-4. Stay awake and monitor the release process for any errors, and answer any prompts.
-#### Manual process
-1. Run `bin/setup && bin/rake` as a "test, coverage, & linting" sanity check
-2. Update the version number in `version.rb`, and ensure `CHANGELOG.md` reflects changes
-3. Run `bin/setup && bin/rake` again as a secondary check, and to update `Gemfile.lock`
-4. Run `git commit -am "🔖 Prepare release v<VERSION>"` to commit the changes
-5. Run `git push` to trigger the final CI pipeline before release, and merge PRs
-    - NOTE: Remember to [check the build][🧪build].
-6. Run `export GIT_TRUNK_BRANCH_NAME="$(git remote show origin | grep 'HEAD branch' | cut -d ' ' -f5)" && echo $GIT_TRUNK_BRANCH_NAME`
-7. Run `git checkout $GIT_TRUNK_BRANCH_NAME`
-8. Run `git pull origin $GIT_TRUNK_BRANCH_NAME` to ensure latest trunk code
-9. Optional for older Bundler (< 2.7.0): Set `SOURCE_DATE_EPOCH` so `rake build` and `rake release` use the same timestamp and generate the same checksums
-    - If your Bundler is >= 2.7.0, you can skip this; builds are reproducible by default.
-    - Run `export SOURCE_DATE_EPOCH=$EPOCHSECONDS && echo $SOURCE_DATE_EPOCH`
-    - If the echo above has no output, then it didn't work.
-    - Note: `zsh/datetime` module is needed, if running `zsh`.
-    - In older versions of `bash` you can use `date +%s` instead, i.e. `export SOURCE_DATE_EPOCH=$(date +%s) && echo $SOURCE_DATE_EPOCH`
-10. Run `bundle exec rake build`
-11. Run `bin/gem_checksums` (more context [1][🔒️rubygems-checksums-pr], [2][🔒️rubygems-guides-pr])
-    to create SHA-256 and SHA-512 checksums. This functionality is provided by the `stone_checksums`
-    [gem][💎stone_checksums].
-    - The script automatically commits but does not push the checksums
-12. Sanity check the SHA256, comparing with the output from the `bin/gem_checksums` command:
-    - `sha256sum pkg/<gem name>-<version>.gem`
-13. Run `bundle exec rake release` which will create a git tag for the version,
-    push git commits and tags, and push the `.gem` file to the gem host configured in the gemspec.
-[📜src-gl]: https://gitlab.com/kettle-rb/bash-merge/
-[📜src-cb]: https://codeberg.org/kettle-rb/bash-merge
-[📜src-gh]: https://github.com/kettle-rb/bash-merge
-[🧪build]: https://github.com/kettle-rb/bash-merge/actions
-[🤝conduct]: https://gitlab.com/kettle-rb/bash-merge/-/blob/main/CODE_OF_CONDUCT.md
-[🖐contrib-rocks]: https://contrib.rocks
-[🖐contributors]: https://github.com/kettle-rb/bash-merge/graphs/contributors
-[🚎contributors-gl]: https://gitlab.com/kettle-rb/bash-merge/-/graphs/main
-[🖐contributors-img]: https://contrib.rocks/image?repo=kettle-rb/bash-merge
-[💎gem-coop]: https://gem.coop
-[🔒️rubygems-security-guide]: https://guides.rubygems.org/security/#building-gems
-[🔒️rubygems-checksums-pr]: https://github.com/rubygems/rubygems/pull/6022
-[🔒️rubygems-guides-pr]: https://github.com/rubygems/guides/pull/325
-[💎stone_checksums]: https://github.com/galtzo-floss/stone_checksums
-[📗keep-changelog]: https://keepachangelog.com/en/1.0.0/
-[📗keep-changelog-img]: https://img.shields.io/badge/keep--a--changelog-1.0.0-FFDD67.svg?style=flat
-[📌semver-breaking]: https://github.com/semver/semver/issues/716#issuecomment-869336139
-[📌major-versions-not-sacred]: https://tom.preston-werner.com/2022/05/23/major-version-numbers-are-not-sacred.html
-[🚎appraisal2]: https://github.com/appraisal-rb/appraisal2
-[🏃‍♂️runner-tool-cache]: https://github.com/ruby/ruby-builder/releases/tag/toolcache

data/FUNDING.md DELETED Viewed

@@ -1,74 +0,0 @@
-<!-- RELEASE-NOTES-FOOTER-START -->
-Official Discord 👉️ [![Live Chat on Discord][✉️discord-invite-img]][✉️discord-invite]
-Many paths lead to being a sponsor or a backer of this project. Are you on such a path?
-[![OpenCollective Backers][🖇osc-backers-i]][🖇osc-backers] [![OpenCollective Sponsors][🖇osc-sponsors-i]][🖇osc-sponsors] [![Sponsor Me on Github][🖇sponsor-img]][🖇sponsor] [![Liberapay Goal Progress][⛳liberapay-img]][⛳liberapay] [![Donate on PayPal][🖇paypal-img]][🖇paypal]
-[![Buy me a coffee][🖇buyme-small-img]][🖇buyme] [![Donate on Polar][🖇polar-img]][🖇polar] [![Donate to my FLOSS efforts at ko-fi.com][🖇kofi-img]][🖇kofi] [![Donate to my FLOSS efforts using Patreon][🖇patreon-img]][🖇patreon]
-[⛳liberapay-img]: https://img.shields.io/liberapay/goal/pboling.svg?logo=liberapay&color=a51611&style=flat
-[⛳liberapay]: https://liberapay.com/pboling/donate
-[🖇osc-backers]: https://opencollective.com/kettle-rb#backer
-[🖇osc-backers-i]: https://opencollective.com/kettle-rb/backers/badge.svg?style=flat
-[🖇osc-sponsors]: https://opencollective.com/kettle-rb#sponsor
-[🖇osc-sponsors-i]: https://opencollective.com/kettle-rb/sponsors/badge.svg?style=flat
-[🖇sponsor-img]: https://img.shields.io/badge/Sponsor_Me!-pboling.svg?style=social&logo=github
-[🖇sponsor]: https://github.com/sponsors/pboling
-[🖇polar-img]: https://img.shields.io/badge/polar-donate-a51611.svg?style=flat
-[🖇polar]: https://polar.sh/pboling
-[🖇kofi-img]: https://img.shields.io/badge/ko--fi-%E2%9C%93-a51611.svg?style=flat
-[🖇kofi]: https://ko-fi.com/O5O86SNP4
-[🖇patreon-img]: https://img.shields.io/badge/patreon-donate-a51611.svg?style=flat
-[🖇patreon]: https://patreon.com/galtzo
-[🖇buyme-small-img]: https://img.shields.io/badge/buy_me_a_coffee-%E2%9C%93-a51611.svg?style=flat
-[🖇buyme]: https://www.buymeacoffee.com/pboling
-[🖇paypal-img]: https://img.shields.io/badge/donate-paypal-a51611.svg?style=flat&logo=paypal
-[🖇paypal]: https://www.paypal.com/paypalme/peterboling
-[✉️discord-invite]: https://discord.gg/3qme4XHNKN
-[✉️discord-invite-img]: https://img.shields.io/discord/1373797679469170758?style=flat
-<!-- RELEASE-NOTES-FOOTER-END -->
-# 🤑 A request for help
-Maintainers have teeth and need to pay their dentists.
-After getting laid off in an RIF in March, and encountering difficulty finding a new one,
-I began spending most of my time building open source tools.
-I'm hoping to be able to pay for my kids' health insurance this month,
-so if you value the work I am doing, I need your support.
-Please consider sponsoring me or the project.
-To join the community or get help 👇️ Join the Discord.
-[![Live Chat on Discord][✉️discord-invite-img-ftb]][✉️discord-invite]
-To say "thanks!" ☝️ Join the Discord or 👇️ send money.
-[![Sponsor kettle-rb/bash-merge on Open Source Collective][🖇osc-all-bottom-img]][🖇osc] 💌 [![Sponsor me on GitHub Sponsors][🖇sponsor-bottom-img]][🖇sponsor] 💌 [![Sponsor me on Liberapay][⛳liberapay-bottom-img]][⛳liberapay] 💌 [![Donate on PayPal][🖇paypal-bottom-img]][🖇paypal]
-# Another Way to Support Open Source Software
-I’m driven by a passion to foster a thriving open-source community – a space where people can tackle complex problems, no matter how small.  Revitalizing libraries that have fallen into disrepair, and building new libraries focused on solving real-world challenges, are my passions.  I was recently affected by layoffs, and the tech jobs market is unwelcoming. I’m reaching out here because your support would significantly aid my efforts to provide for my family, and my farm (11 🐔 chickens, 2 🐶 dogs, 3 🐰 rabbits, 8 🐈‍ cats).
-If you work at a company that uses my work, please encourage them to support me as a corporate sponsor. My work on gems you use might show up in `bundle fund`.
-I’m developing a new library, [floss_funding][🖇floss-funding-gem], designed to empower open-source developers like myself to get paid for the work we do, in a sustainable way. Please give it a look.
-**[Floss-Funding.dev][🖇floss-funding.dev]: 👉️ No network calls. 👉️ No tracking. 👉️ No oversight. 👉️ Minimal crypto hashing. 💡 Easily disabled nags**
-[⛳liberapay-bottom-img]: https://img.shields.io/liberapay/goal/pboling.svg?style=for-the-badge&logo=liberapay&color=a51611
-[🖇osc-all-img]: https://img.shields.io/opencollective/all/kettle-rb
-[🖇osc-sponsors-img]: https://img.shields.io/opencollective/sponsors/kettle-rb
-[🖇osc-backers-img]: https://img.shields.io/opencollective/backers/kettle-rb
-[🖇osc-all-bottom-img]: https://img.shields.io/opencollective/all/kettle-rb?style=for-the-badge
-[🖇osc-sponsors-bottom-img]: https://img.shields.io/opencollective/sponsors/kettle-rb?style=for-the-badge
-[🖇osc-backers-bottom-img]: https://img.shields.io/opencollective/backers/kettle-rb?style=for-the-badge
-[🖇osc]: https://opencollective.com/kettle-rb
-[🖇sponsor-bottom-img]: https://img.shields.io/badge/Sponsor_Me!-pboling-blue?style=for-the-badge&logo=github
-[🖇buyme-img]: https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20latte&emoji=&slug=pboling&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff
-[🖇paypal-bottom-img]: https://img.shields.io/badge/donate-paypal-a51611.svg?style=for-the-badge&logo=paypal&color=0A0A0A
-[🖇floss-funding.dev]: https://floss-funding.dev
-[🖇floss-funding-gem]: https://github.com/galtzo-floss/floss_funding
-[✉️discord-invite-img-ftb]: https://img.shields.io/discord/1373797679469170758?style=for-the-badge

data/LICENSE.txt DELETED Viewed

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-Copyright (c) 2025-2026 Peter H. Boling
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/REEK DELETED Viewed

File without changes

data/RUBOCOP.md DELETED Viewed

@@ -1,71 +0,0 @@
-# RuboCop Usage Guide
-## Overview
-A tale of two RuboCop plugin gems.
-### RuboCop Gradual
-This project uses `rubocop_gradual` instead of vanilla RuboCop for code style checking. The `rubocop_gradual` tool allows for gradual adoption of RuboCop rules by tracking violations in a lock file.
-### RuboCop LTS
-This project uses `rubocop-lts` to ensure, on a best-effort basis, compatibility with Ruby >= 1.9.2.
-RuboCop rules are meticulously configured by the `rubocop-lts` family of gems to ensure that a project is compatible with a specific version of Ruby. See: https://rubocop-lts.gitlab.io for more.
-## Checking RuboCop Violations
-To check for RuboCop violations in this project, always use:
-```bash
-bundle exec rake rubocop_gradual:check
-```
-**Do not use** the standard RuboCop commands like:
-- `bundle exec rubocop`
-- `rubocop`
-## Understanding the Lock File
-The `.rubocop_gradual.lock` file tracks all current RuboCop violations in the project. This allows the team to:
-1. Prevent new violations while gradually fixing existing ones
-2. Track progress on code style improvements
-3. Ensure CI builds don't fail due to pre-existing violations
-## Common Commands
-- **Check violations**
-    - `bundle exec rake rubocop_gradual`
-    - `bundle exec rake rubocop_gradual:check`
-- **(Safe) Autocorrect violations, and update lockfile if no new violations**
-  - `bundle exec rake rubocop_gradual:autocorrect`
-- **Force update the lock file (w/o autocorrect) to match violations present in code**
-  - `bundle exec rake rubocop_gradual:force_update`
-## Workflow
-1. Before submitting a PR, run `bundle exec rake rubocop_gradual:autocorrect`
-   a. or just the default `bundle exec rake`, as autocorrection is a pre-requisite of the default task.
-2. If there are new violations, either:
-   - Fix them in your code
-   - Run `bundle exec rake rubocop_gradual:force_update` to update the lock file (only for violations you can't fix immediately)
-3. Commit the updated `.rubocop_gradual.lock` file along with your changes
-## Never add inline RuboCop disables
-Do not add inline `rubocop:disable` / `rubocop:enable` comments anywhere in the codebase (including specs, except when following the few existing `rubocop:disable` patterns for a rule already being disabled elsewhere in the code). We handle exceptions in two supported ways:
-- Permanent/structural exceptions: prefer adjusting the RuboCop configuration (e.g., in `.rubocop.yml`) to exclude a rule for a path or file pattern when it makes sense project-wide.
-- Temporary exceptions while improving code: record the current violations in `.rubocop_gradual.lock` via the gradual workflow:
-  - `bundle exec rake rubocop_gradual:autocorrect` (preferred; will autocorrect what it can and update the lock only if no new violations were introduced)
-  - If needed, `bundle exec rake rubocop_gradual:force_update` (as a last resort when you cannot fix the newly reported violations immediately)
-In general, treat the rules as guidance to follow; fix violations rather than ignore them. For example, RSpec conventions in this project expect `described_class` to be used in specs that target a specific class under test.
-## Benefits of rubocop_gradual
-- Allows incremental adoption of code style rules
-- Prevents CI failures due to pre-existing violations
-- Provides a clear record of code style debt
-- Enables focused efforts on improving code quality over time

data/SECURITY.md DELETED Viewed

@@ -1,21 +0,0 @@
-# Security Policy
-## Supported Versions
-| Version  | Supported |
-|----------|-----------|
-| 1.latest | ✅         |
-## Security contact information
-To report a security vulnerability, please use the
-[Tidelift security contact](https://tidelift.com/security).
-Tidelift will coordinate the fix and disclosure.
-## Additional Support
-If you are interested in support for versions older than the latest release,
-please consider sponsoring the project / maintainer @ https://liberapay.com/pboling/donate,
-or find other sponsorship links in the [README].
-[README]: README.md

data/lib/bash/merge/conflict_resolver.rb DELETED Viewed

@@ -1,199 +0,0 @@
-# frozen_string_literal: true
-module Bash
-  module Merge
-    # Resolves conflicts between template and destination Bash content
-    # using structural signatures and configurable preferences.
-    #
-    # @example Basic usage
-    #   resolver = ConflictResolver.new(template_analysis, dest_analysis)
-    #   resolver.resolve(result)
-    class ConflictResolver < ::Ast::Merge::ConflictResolverBase
-      # Creates a new ConflictResolver
-      #
-      # @param template_analysis [FileAnalysis] Analyzed template file
-      # @param dest_analysis [FileAnalysis] Analyzed destination file
-      # @param preference [Symbol, Hash] Which version to prefer when
-      #   nodes have matching signatures:
-      #   - :destination (default) - Keep destination version (customizations)
-      #   - :template - Use template version (updates)
-      # @param add_template_only_nodes [Boolean] Whether to add nodes only in template
-      # @param match_refiner [#call, nil] Optional match refiner for fuzzy matching
-      # @param options [Hash] Additional options for forward compatibility
-      # @param node_typing [Hash{Symbol,String => #call}, nil] Node typing configuration
-      #   for per-node-type preferences
-      def initialize(template_analysis, dest_analysis, preference: :destination, add_template_only_nodes: false, match_refiner: nil, node_typing: nil, **options)
-        super(
-          strategy: :batch,
-          preference: preference,
-          template_analysis: template_analysis,
-          dest_analysis: dest_analysis,
-          add_template_only_nodes: add_template_only_nodes,
-          match_refiner: match_refiner,
-          **options
-        )
-        @node_typing = node_typing
-        @emitter = Emitter.new
-      end
-      # Resolve conflicts and populate the result
-      #
-      # @param result [MergeResult] Result object to populate
-      def resolve(result)
-        DebugLogger.time("ConflictResolver#resolve") do
-          template_nodes = @template_analysis.nodes
-          dest_nodes = @dest_analysis.nodes
-          # Clear emitter for fresh merge
-          @emitter.clear
-          # Build signature maps
-          template_by_sig = build_signature_map(template_nodes, @template_analysis)
-          dest_by_sig = build_signature_map(dest_nodes, @dest_analysis)
-          # Track which nodes have been processed
-          processed_template_sigs = ::Set.new
-          processed_dest_sigs = ::Set.new
-          # Process nodes via emitter
-          merge_nodes_to_emitter(
-            template_nodes,
-            dest_nodes,
-            template_by_sig,
-            dest_by_sig,
-            processed_template_sigs,
-            processed_dest_sigs,
-          )
-          # Transfer emitter output to result
-          emitted_content = @emitter.to_s
-          unless emitted_content.empty?
-            emitted_content.lines.each do |line|
-              result.add_line(line.chomp, decision: MergeResult::DECISION_MERGED, source: :merged)
-            end
-          end
-          DebugLogger.debug("Conflict resolution complete", {
-            template_nodes: template_nodes.size,
-            dest_nodes: dest_nodes.size,
-            result_lines: result.line_count,
-          })
-        end
-      end
-      private
-      def merge_nodes_to_emitter(template_nodes, dest_nodes, template_by_sig, dest_by_sig, processed_template_sigs, processed_dest_sigs)
-        # First pass: Process destination nodes and find matches
-        dest_nodes.each do |dest_node|
-          dest_sig = @dest_analysis.generate_signature(dest_node)
-          # Freeze blocks from destination are always preserved
-          if freeze_node?(dest_node)
-            emit_freeze_block(dest_node)
-            processed_dest_sigs << dest_sig if dest_sig
-            next
-          end
-          if dest_sig && template_by_sig[dest_sig]
-            # Found matching node in template
-            template_info = template_by_sig[dest_sig].first
-            template_node = template_info[:node]
-            # Decide which to emit based on preference
-            emit_preferred_node(template_node, dest_node)
-            processed_dest_sigs << dest_sig
-            processed_template_sigs << dest_sig
-          else
-            # Destination-only node - always keep
-            emit_node(dest_node, @dest_analysis)
-            processed_dest_sigs << dest_sig if dest_sig
-          end
-        end
-        # Second pass: Add template-only nodes if configured
-        return unless @add_template_only_nodes
-        template_nodes.each do |template_node|
-          template_sig = @template_analysis.generate_signature(template_node)
-          # Skip if already processed (matched with dest)
-          next if template_sig && processed_template_sigs.include?(template_sig)
-          # Skip freeze blocks from template
-          next if freeze_node?(template_node)
-          # Add template-only node
-          emit_node(template_node, @template_analysis)
-          processed_template_sigs << template_sig if template_sig
-        end
-      end
-      def emit_preferred_node(template_node, dest_node)
-        if preference_for_pair(template_node, dest_node) == :destination
-          emit_node(dest_node, @dest_analysis)
-        else
-          emit_node(template_node, @template_analysis)
-        end
-      end
-      def preference_for_pair(template_node, dest_node)
-        return @preference unless @preference.is_a?(Hash)
-        typed_template = apply_node_typing(template_node)
-        typed_dest = apply_node_typing(dest_node)
-        if Ast::Merge::NodeTyping.typed_node?(typed_template)
-          merge_type = Ast::Merge::NodeTyping.merge_type_for(typed_template)
-          return @preference.fetch(merge_type) { default_preference } if merge_type
-        end
-        if Ast::Merge::NodeTyping.typed_node?(typed_dest)
-          merge_type = Ast::Merge::NodeTyping.merge_type_for(typed_dest)
-          return @preference.fetch(merge_type) { default_preference } if merge_type
-        end
-        default_preference
-      end
-      def apply_node_typing(node)
-        return node unless @node_typing
-        return node unless node
-        Ast::Merge::NodeTyping.process(node, @node_typing)
-      end
-      # Emit a single node to the emitter
-      # @param node [NodeWrapper] Node to emit
-      # @param analysis [FileAnalysis] Analysis for accessing source
-      def emit_node(node, analysis)
-        return if freeze_node?(node)
-        # Emit leading comments
-        if node.start_line
-          leading = analysis.comment_tracker.leading_comments_before(node.start_line)
-          leading.each do |comment|
-            @emitter.emit_tracked_comment(comment)
-          end
-        end
-        # Emit the node content
-        if node.start_line && node.end_line
-          lines = []
-          (node.start_line..node.end_line).each do |line_num|
-            line = analysis.line_at(line_num)
-            lines << line if line
-          end
-          @emitter.emit_raw_lines(lines)
-        end
-      end
-      # Emit a freeze block
-      # @param freeze_node [FreezeNode] Freeze block to emit
-      def emit_freeze_block(freeze_node)
-        @emitter.emit_raw_lines(freeze_node.lines)
-      end
-    end
-  end
-end