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

Cannot stage merged changes #5455

Closed
csweichel opened this issue Jun 13, 2019 · 1 comment · Fixed by #5456
Closed

Cannot stage merged changes #5455

csweichel opened this issue Jun 13, 2019 · 1 comment · Fixed by #5456
Assignees
@akosyakov
Labels
bug bugs found in the application git issues related to git

Comments

@csweichel
Copy link

Description

During a rebase I had to merge changes. I cannot stage those changes using the SCM view (clicking the + button has no effect).

Reproduction Steps

  1. Rebase a branch so that changes need to be merged manually
  2. Merge those changes
  3. Try to stage those changes

OS and Theia version:
tested in gitpod.io

Diagnostics:
there is no error on the console
@akosyakov akosyakov added bug bugs found in the application git issues related to git labels Jun 13, 2019
@akosyakov akosyakov self-assigned this Jun 13, 2019
@akosyakov akosyakov mentioned this issue Jun 13, 2019
Closed
@akosyakov
Copy link
Member

In order to reproduce merge conflict: https://stackoverflow.com/questions/43702944/reproducing-git-merge-conflict-dd

akosyakov added a commit that referenced this issue Jun 13, 2019
@akosyakov
fix #5455: stage files from merge group properly
93a6517 
Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
@akosyakov akosyakov mentioned this issue Jun 13, 2019
Merged
AlexTugarev added a commit that referenced this issue Jun 14, 2019
@AlexTugarev @akosyakov
fix #5455: stage files from merge group properly
f77f118 
Co-authored-by: Anton Kosyakov <anton.kosyakov@typefox.io>
Also-by: Anton Kosyakov <anton.kosyakov@typefox.io>
Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
akosyakov added a commit that referenced this issue Jun 19, 2019
@AlexTugarev @akosyakov
fix #5455: stage files from merge group properly
531aa3b 
Co-authored-by: Anton Kosyakov <anton.kosyakov@typefox.io>
Also-by: Anton Kosyakov <anton.kosyakov@typefox.io>
Signed-off-by: Alex Tugarev <alex.tugarev@typefox.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@akosyakov akosyakov

Labels
bug bugs found in the application git issues related to git
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

stage files from merge group properly eclipse-theia/theia
2 participants
@akosyakov @csweichel