Merge main into feature/windows-node-issue#6243
Open
aws-toolkit-automation wants to merge 4 commits intofeature/windows-node-issuefrom
Open
Merge main into feature/windows-node-issue#6243aws-toolkit-automation wants to merge 4 commits intofeature/windows-node-issuefrom
aws-toolkit-automation wants to merge 4 commits intofeature/windows-node-issuefrom
Conversation
…me settings (#6217) * fix: Handle directory paths in user-configured Node.js runtime settings * fix: fix unit tests cases * fix: Unit test cases --------- Co-authored-by: chungjac <chungjac@amazon.com>
Co-authored-by: chungjac <chungjac@amazon.com>
…straint (#6229) Co-authored-by: Aseem sharma <198968351+aseemxs@users.noreply.github.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
4 participants
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.
Automatic merge failed
Command line hint
To perform the merge from the command line, you could do something like the following (where "origin" is the name of the remote in your local git repo):