Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Merge file functions produce errors #37

Merged
merged 1 commit into from
Aug 25, 2023
Merged

fix: Merge file functions produce errors #37

merged 1 commit into from
Aug 25, 2023

Conversation

aldrichtr
Copy link
Owner

  • Merge SourceItem added extra lines in the "using namespace" section. This was because the regex needed to include the entire line.
  • Merge Build Configuration did not implement the ability to merge at a specific key.

@aldrichtr
fix: Merge file functions produce errors
0f2ff53 
- Merge SourceItem added extra lines in the "using namespace" section.
  This was because the regex needed to include the entire line.
- Merge Build Configuration did not implement the ability to merge at a
  specific key.
@aldrichtr aldrichtr added area.module Related to the stitch module is.bug Something isnt working labels Aug 18, 2023
@aldrichtr aldrichtr changed the base branch from main to release/v0.1.2 August 18, 2023 16:57
@aldrichtr aldrichtr merged commit 9168a42 into release/v0.1.2 Aug 25, 2023
5 checks passed
@aldrichtr aldrichtr deleted the fix/merge-source-error branch November 14, 2023 16:32
@aldrichtr aldrichtr self-assigned this Jan 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aldrichtr aldrichtr

Labels
area.module Related to the stitch module is.bug Something isnt working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@aldrichtr