-
Notifications
You must be signed in to change notification settings - Fork 273
build(252): Add 252 beta build #5914
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.
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
Merged
Merged
Changes from 3 commits
Commits
Show all changes
81 commits
Select commit
Hold shift + click to select a range
399e8b2
bump 252
samgst-amazon f6181cd
Kotlin dependency
samgst-amazon efdf618
Merge branch 'main' into samgst/bump-252
samgst-amazon 9f4629d
bump rider nugetVersion
samgst-amazon 416eb8c
Merge remote-tracking branch 'origin/samgst/bump-252' into samgst/bum…
samgst-amazon 68ea3ac
run 252 ci
samgst-amazon fe8b5a4
bump go version for IU
samgst-amazon 148d27a
add eap version to nuget
samgst-amazon ba18e4f
changed copyVisibility
samgst-amazon 49abf79
Revert "changed copyVisibility"
samgst-amazon 443252b
correct kotlin version for 252
samgst-amazon 6ab9603
Fix PropertyKey annotation placement for Kotlin 2.1 compatibility
samgst-amazon 1071fbb
move TestOnly annotation to file level
samgst-amazon 887a6c0
Merge branch 'main' into samgst/bump-252
samgst-amazon 5a63900
detekt
samgst-amazon 9477486
correct TestOnly annotation
samgst-amazon eed5b1e
ComputableActionGroup deprecated
samgst-amazon d8f89c4
add json module
samgst-amazon d583a90
replace buildDir deprecated calls
samgst-amazon aa32e91
ComputableActionsGroup deprecation
samgst-amazon 075b9f3
fix annotations
samgst-amazon c04fb44
detekt
samgst-amazon 0a88530
remove annotation
samgst-amazon f1d6188
update PythonPackageManager usage
samgst-amazon 9e966d8
remove annotation for member property
samgst-amazon d7a7a77
split PythonPackageManager implementation for new version
samgst-amazon c387c53
split PythonPackageManager implementation for new version
samgst-amazon cb88f2b
update to beta
samgst-amazon 3c6e126
update filePermissions implementation
samgst-amazon 83bb210
gateway beta version
samgst-amazon a25c1d6
adapt gateway build to 252
samgst-amazon 9ee949f
Merge branch 'main' into samgst/bump-252
samgst-amazon 7b0cfad
use correct gateway EAP version
samgst-amazon fd00d92
Merge remote-tracking branch 'origin/samgst/bump-252' into samgst/bum…
samgst-amazon 25738fe
move UpdateWorkspaceSettingsTab.kt to versions <=251
samgst-amazon b4c4c3c
fix gradle plugin wrong version
rli 4b02372
gateway compile
rli 72e7805
fix CI issues for 242-251
samgst-amazon dcad440
Merge branch 'main' into samgst/bump-252
samgst-amazon cd7fb4b
update TestScope
samgst-amazon 4f60b93
Merge remote-tracking branch 'origin/samgst/bump-252' into samgst/bum…
samgst-amazon 8269eac
bump detekt version
samgst-amazon cf30c86
bump gradle version to 2.7.0
samgst-amazon 09bf3cc
missing import
samgst-amazon 9bfebe7
disable prepareJarSearchableOptions
samgst-amazon bf2a646
Solution annotation fix
samgst-amazon 96085c3
disable buildsearchableOptions
samgst-amazon e925968
detekt
samgst-amazon 0c332f0
revert searchableOptions hack
samgst-amazon 8a60ccd
process plugin-shim.xml as plugin.xml
samgst-amazon 71e74d1
disable rider tests for linux
samgst-amazon 0701114
better handling for prepareJarSearchableOptions
samgst-amazon 6e2b36c
add org.toml.lang plugin
samgst-amazon 0ff80f8
fix explicit module dependency for maven
samgst-amazon 467b492
fix compileTestKotlin error for 242-251
samgst-amazon 68fcc8f
detekt
samgst-amazon 0113026
fix VfsRootAccessNotAllowedError for test
samgst-amazon 054db91
move fix to test base class
samgst-amazon 5647300
remove duplicate implementation
samgst-amazon 7ca6322
detekt
samgst-amazon be4cae7
update junit5
samgst-amazon 449ff1a
Merge branch 'main' into samgst/bump-252
samgst-amazon 1082d85
fix windows file locking issue
samgst-amazon e5101b4
bump GW version for 251
samgst-amazon 334f8f3
revert: fix windows file locking issue
samgst-amazon fac5fe4
Merge remote-tracking branch 'origin/samgst/bump-252' into samgst/bum…
samgst-amazon ea63804
move util split to tst-252 to avoid compilation errors
samgst-amazon f208c59
fix test annotation compilation errors
samgst-amazon 13edaf6
remove imports
samgst-amazon 02e8d0d
detekt
samgst-amazon 3f5f6e5
fix 251 gateway compile error
samgst-amazon 906875b
bump to 2025.2 in gradle.properties
samgst-amazon 47ac3df
bump platform version to fix windows tests
samgst-amazon c0ae0b8
revert platform version down to 2.6.0
samgst-amazon 20e4705
add org.toml.lang dependency to 251
samgst-amazon 8c3ab14
add missing bundled plugins to 251
samgst-amazon 34f09c9
fix: access outside allowed roots windows 252 CI error
samgst-amazon cb7a17b
turn off rider tests for both OS
samgst-amazon 7866713
Merge branch 'main' into samgst/bump-252
samgst-amazon 028c419
changelog
samgst-amazon 85d31b4
Merge remote-tracking branch 'origin/samgst/bump-252' into samgst/bum…
samgst-amazon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run AWS Toolkit - Community [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IC-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-toolkit:intellij-standalone:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run AWS Toolkit - Gateway [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/jetbrains-gateway/build/idea-sandbox/GW-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value=" -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-toolkit:jetbrains-gateway:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run AWS Toolkit - Rider [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/RD-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-toolkit:intellij-standalone:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run AWS Toolkit - Ultimate [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/toolkit/intellij-standalone/build/idea-sandbox/IU-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-toolkit:intellij-standalone:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run All - Community [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IC-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":sandbox-all:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run All - Rider [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/RD-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":sandbox-all:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run All - Ultimate [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/sandbox-all/build/idea-sandbox/IU-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":sandbox-all:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run Amazon Q - Community [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IC-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IC -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-amazonq:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run Amazon Q - Rider [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/RD-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=RD -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-amazonq:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Run Amazon Q - Ultimate [2025.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2025.2"> | ||
| <log_file alias="idea.log" path="$PROJECT_DIR$/plugins/amazonq/build/idea-sandbox/IU-2025.2/log/idea.log" /> | ||
| <ExternalSystemSettings> | ||
| <option name="executionName" /> | ||
| <option name="externalProjectPath" value="$PROJECT_DIR$" /> | ||
| <option name="externalSystemIdString" value="GRADLE" /> | ||
| <option name="scriptParameters" value="-PrunIdeVariant=IU -PideProfileName=2025.2" /> | ||
| <option name="taskDescriptions"> | ||
| <list /> | ||
| </option> | ||
| <option name="taskNames"> | ||
| <list> | ||
| <option value=":plugin-amazonq:runIde" /> | ||
| </list> | ||
| </option> | ||
| <option name="vmOptions" /> | ||
| </ExternalSystemSettings> | ||
| <ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess> | ||
| <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> | ||
| <DebugAllEnabled>false</DebugAllEnabled> | ||
| <RunAsTest>false</RunAsTest> | ||
| <method v="2" /> | ||
| </configuration> | ||
| </component> |
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
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
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
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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.