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

Che-Code automatic rebase against upstream VS Code is failed #22577

Closed
RomanNikitenko opened this issue Oct 3, 2023 · 0 comments
Closed

Che-Code automatic rebase against upstream VS Code is failed #22577

RomanNikitenko opened this issue Oct 3, 2023 · 0 comments
Assignees
@RomanNikitenko
Labels
area/editor/vscode Issues related to the Code OSS editor of Che kind/task Internal things, technical debt, and to-do tasks to be performed. severity/P1 Has a major impact to usage or development of the system.

Comments

@RomanNikitenko
Copy link
Member

RomanNikitenko commented Oct 3, 2023 •
edited
Loading

Is your task related to a problem? Please describe

The GitHub Workflow for Che-Code automatic rebase against upstream VS Code failed with:

Using git /usr/bin/git git version 2.42.0
⚠️  There are conflicting files, trying to solve...
 ➡️  Analyzing conflict for code/build/lib/i18n.js
code/build/lib/i18n.js file cannot be automatically rebased. Aborting
Error: Process completed with exit code 1.

Describe the solution you'd like

Fix the incompatibility with the upstream.
@RomanNikitenko RomanNikitenko added kind/task Internal things, technical debt, and to-do tasks to be performed. severity/P1 Has a major impact to usage or development of the system. area/editor/vscode Issues related to the Code OSS editor of Che labels Oct 3, 2023
@RomanNikitenko RomanNikitenko self-assigned this Oct 3, 2023
This was referenced Oct 3, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@RomanNikitenko RomanNikitenko

Labels
area/editor/vscode Issues related to the Code OSS editor of Che kind/task Internal things, technical debt, and to-do tasks to be performed. severity/P1 Has a major impact to usage or development of the system.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@RomanNikitenko