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.

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

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

Closed
azatsarynnyy opened this issue Mar 6, 2023 · 2 comments
Closed

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

azatsarynnyy opened this issue Mar 6, 2023 · 2 comments
Assignees
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

@azatsarynnyy
Copy link
Member

Is your task related to a problem? Please describe

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

Run ./rebase.sh
  ./rebase.sh
  shell: /usr/bin/bash -e {0}
Using git /usr/bin/git git version [2](https://github.com/che-incubator/che-code/actions/runs/4344066991/jobs/7586894785#step:7:2).[3](https://github.com/che-incubator/che-code/actions/runs/4344066991/jobs/7586894785#step:7:3)9.2
⚠️  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.

Describe alternatives you've considered

No response

Additional context

The upstream changes conflict with the PR che-incubator/che-code#178 changes.

@azatsarynnyy azatsarynnyy 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 Mar 6, 2023
@azatsarynnyy azatsarynnyy mentioned this issue Mar 6, 2023
7 tasks
@RomanNikitenko
Copy link
Member

RomanNikitenko commented Mar 6, 2023

@l0rd
To clarify:

  • the current issue and https://issues.redhat.com/browse/CRW-4089 - are different issues
  • it is not a regression
  • we have this kind of problem from time to time because we have our own logic for some entities on the VS Code side. As result we have a git conflict when the same file/logic is changed in the upstream

@azatsarynnyy
Copy link
Member Author

It's fixed by che-incubator/che-code#188.
Auto-rebase is restored https://github.com/che-incubator/che-code/actions/runs/4352354102.
Thanks, @RomanNikitenko for taking care of that 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

No branches or pull requests

3 participants