986777: Resolved conflict occured against master branch in our AIAssitView and Chat UIcomponent - #654
Merged
Merged
Conversation
…j2-javascript-docs into EJ2-986777-ResCnfltMstr # Conflicts: # ej2-javascript-toc.html # ej2-javascript/chat-ui/js/es5-getting-started.md # ej2-javascript/code-snippet/ai-assistview/ai-integrations/gemini-ai/index.ts # ej2-javascript/code-snippet/ai-assistview/ai-integrations/open-ai/index.ts # ej2-javascript/code-snippet/diagram/symbol-palette-contentFnTemplate/index.ts # ej2-javascript/code-snippet/gantt/selection-cs11/index.js # ej2-javascript/code-snippet/gantt/selection-cs11/index.ts # ej2-javascript/code-snippet/gantt/selection-cs11/js/index.html # ej2-javascript/code-snippet/gantt/selection-cs11/ts/index.html # ej2-javascript/diagram/ts/symbol-palette/symbol-palette.md # ej2-typescript-toc.html
Contributor
|
Build Status: INPROGRESS 🔃 |
Contributor
|
CI Status: FAILURE ❌ |
DeepakRajSundar
enabled auto-merge
October 14, 2025 14:10
DeepakRajSundar
approved these changes
Oct 14, 2025
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
3 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.
Feature description
Resolved conflict occured in our AIAssitView and ChatUI component.
986777
Requirement and specification document.
NA
API Review task
NA
Output screenshots
NA
Feature matrix document
Provide the details about the areas or combinations which have been tested against this code changes.
Feature acceptance criteria (Test-case document)
NA
Automation details
Mark 'Is Automated' field as (Yes, Manual, Not Applicable) in corresponding JIRA task once the feature is automated.
Test bed sample location
NA
Feature completion checklist
UX changes got approval if UI is added or modified?
Drafted UG for this feature?
Content team reviewed the UI content changes.
Is this the common feature which needs to be addressed in the same component or on other components in our platform?
Is there any existing behavior change due to this code change?
breaking-changelabel.Blazor Checklist
Confirm whether the ensured feature is in both Blazor Server and WASM.
Do the code changes cause any memory leak and performance issue?
Reviewer Checklist
Created task in Blazor to synchronize if the feature is not available and applicable.