feat: add merging functionality #12
Draft
Commits on Feb 25, 2022
-
incorporate bom link; add test files for components merge
Signed-off-by: nscuro <nscuro@protonmail.com>
-
gotta love them license headers
Signed-off-by: nscuro <nscuro@protonmail.com>
Commits on Feb 26, 2022
-
add hierarchical merge again; add properties tests
Signed-off-by: nscuro <nscuro@protonmail.com>
Commits on Mar 1, 2022
Commits on Apr 14, 2022
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.