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 requires manual conflict resolution #21471

Closed
azatsarynnyy opened this issue Jun 15, 2022 · 0 comments · Fixed by che-incubator/che-code#56
Closed

Che-Code automatic rebase against upstream VS Code requires manual conflict resolution #21471

azatsarynnyy opened this issue Jun 15, 2022 · 0 comments · Fixed by che-incubator/che-code#56
Assignees
@azatsarynnyy
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.
Milestone
7.50

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 is failed:
https://github.com/che-incubator/che-code/runs/6904230410?check_suite_focus=true

Describe the solution you'd like

It requires manual resolution of the conflict:

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/runs/6904230410?check_suite_focus=true#step:7:2).[3](https://github.com/che-incubator/che-code/runs/6904230410?check_suite_focus=true#step:7:3)6.1
⚠️  There are conflicting files, trying to solve...
 ➡️  Analyzing conflict for code/build/gulpfile.extensions.js
code/build/gulpfile.extensions.js file cannot be automatically rebased. Aborting
Error: Process completed with exit code 1.

Describe alternatives you've considered

No response

Additional context

No response
@azatsarynnyy azatsarynnyy added kind/task Internal things, technical debt, and to-do tasks to be performed. sprint/current severity/P1 Has a major impact to usage or development of the system. team/editors area/editor/vscode Issues related to the Code OSS editor of Che labels Jun 15, 2022
@azatsarynnyy azatsarynnyy added this to the 7.50 milestone Jun 15, 2022
This was referenced Jun 15, 2022
Closed
Merged
@azatsarynnyy azatsarynnyy self-assigned this Jun 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@azatsarynnyy azatsarynnyy

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
7.50
Development

Successfully merging a pull request may close this issue.

Rebase against upstream VS Code to fix the auto-rebase job che-incubator/che-code
1 participant
@azatsarynnyy