bash-merge 2.0.6 → 7.1.3

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 (30) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/LICENSE.md +13 -0
  4. data/README.md +98 -645
  5. data/lib/bash/merge/comment_tracker.rb +36 -100
  6. data/lib/bash/merge/debug_logger.rb +10 -10
  7. data/lib/bash/merge/emitter.rb +45 -33
  8. data/lib/bash/merge/file_analysis.rb +133 -33
  9. data/lib/bash/merge/freeze_node.rb +9 -9
  10. data/lib/bash/merge/merge_result.rb +11 -5
  11. data/lib/bash/merge/node_wrapper.rb +89 -36
  12. data/lib/bash/merge/provider.rb +983 -0
  13. data/lib/bash/merge/smart_merger.rb +641 -32
  14. data/lib/bash/merge/version.rb +5 -4
  15. data/lib/bash/merge.rb +120 -25
  16. data/lib/bash-merge.rb +7 -1
  17. data/sig/bash/merge.rbs +18 -248
  18. data.tar.gz.sig +3 -1
  19. metadata +84 -88
  20. metadata.gz.sig +0 -0
  21. data/CHANGELOG.md +0 -211
  22. data/CITATION.cff +0 -20
  23. data/CODE_OF_CONDUCT.md +0 -134
  24. data/CONTRIBUTING.md +0 -227
  25. data/FUNDING.md +0 -74
  26. data/LICENSE.txt +0 -21
  27. data/REEK +0 -0
  28. data/RUBOCOP.md +0 -71
  29. data/SECURITY.md +0 -21
  30. data/lib/bash/merge/conflict_resolver.rb +0 -199
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6c986cd0c94a1ce089bbd91e4dfaf8231fce4f1c7be371d2360fe9d554629c66
4
- data.tar.gz: a015c172a3927379ccdc99306aeead042f79f33b7b75f4d6634039fa43383419
3
+ metadata.gz: 63912e4ed1e5c589b747fe8c4bff43704efb8011c051c738c140a3a9b8372610
4
+ data.tar.gz: c37449f1e387c5beeb1f4bcd062a5c748ec2cbeae76c1b3dd8e1559c8f3f8404
5
5
  SHA512:
6
- metadata.gz: b4d132dc07bfc018c0d4624d4db9d054959fff75c886fd63b2c8e7864586c19f865f9f0c13230dbcf0d7709ef8819afde7f821650a1724a13a173c1e3f37d6a9
7
- data.tar.gz: 8000de3038c098bcfafc24db674313fef4e1c3e2e51ad55e6b696f0135482d740afc0e722e017d259b52166724d675eb680b74f4530eae3423040826993c441b
6
+ metadata.gz: 05c63cd77818e9091f81afdc9f33212c0c66f40b266f4d9a57f7426ca4ef9c39b4a07da65d599f06f8bd8987ac12695cfbf05158d26dec7bf500243ade3a9e5b
7
+ data.tar.gz: ca5966709c53a0ebac627228ebf76b3bdc1541efef4cc6f40399cef04c71870b0f5fd3c0d8a325fc46a428388851d78c52e1cd919c7c82b6f49d0f25d42b0221
checksums.yaml.gz.sig CHANGED
Binary file
data/LICENSE.md ADDED
@@ -0,0 +1,13 @@
1
+ # License
2
+
3
+ This project is made available under the following licenses.
4
+ Choose the option that best fits your use case:
5
+
6
+ - [AGPL-3.0-only](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/AGPL-3.0-only.md)
7
+ - [PolyForm-Small-Business-1.0.0](https://github.com/structuredmerge/structuredmerge-ruby/blob/main/PolyForm-Small-Business-1.0.0.md)
8
+
9
+ If none of the above licenses fit your use case, please [contact us](mailto:floss@galtzo.com) to discuss a custom commercial license.
10
+
11
+ ## Copyright Notice
12
+
13
+ - Required Notice: Copyright (c) 2026 Peter H. Boling