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

Completing the merge action still shows notification that there are pending conflicts in scm view #5666

Closed
deepak1556 opened this issue Jan 24, 2024 · 5 comments · Fixed by #5669
Closed

Completing the merge action still shows notification that there are pending conflicts in scm view #5666

deepak1556 opened this issue Jan 24, 2024 · 5 comments · Fixed by #5669
Assignees
@alexr00
Labels
bug Issue identified by VS Code Team member as probable bug verified Verification succeeded

Comments

@deepak1556
Copy link

Testing #5648

In the screenshot below you can see there are no pending conflicts in the scm view but the notification indicates there is.

Screenshot 2024-01-24 at 14 05 00
@alexr00
Copy link
Member

alexr00 commented Jan 24, 2024

@deepak1556 did you commit the merge?

@alexr00 alexr00 added the info-needed Issue requires more information from poster label Jan 24, 2024
@deepak1556
Copy link
Author

deepak1556 commented Jan 24, 2024 •
edited
Loading

Yes I did, the line Merge branch 'main' into robo/test is from the merge action.

@alexr00 alexr00 added bug Issue identified by VS Code Team member as probable bug and removed info-needed Issue requires more information from poster labels Jan 24, 2024
@alexr00 alexr00 added this to the December / January 2024 milestone Jan 24, 2024
@alexr00
Copy link
Member

alexr00 commented Jan 24, 2024

Did you commit via the command line?

@deepak1556
Copy link
Author

Nope, I did it from the SCM view

@alexr00
Copy link
Member

alexr00 commented Jan 24, 2024

I assume then that you resolved the merge without using the merge editor.

alexr00 added a commit that referenced this issue Jan 24, 2024
@alexr00
Completing the merge action still shows notification that there are p…
37aafde 
…ending conflicts in scm view

Fixes #5666
@alexr00 alexr00 mentioned this issue Jan 24, 2024
Merged
alexr00 added a commit that referenced this issue Jan 24, 2024
@alexr00
Completing the merge action still shows notification that there are p…
8942d21 
…ending conflicts in scm view (#5669)

Fixes #5666
@bhavyaus bhavyaus added the verified Verification succeeded label Jan 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@alexr00 alexr00

Labels
bug Issue identified by VS Code Team member as probable bug verified Verification succeeded
Projects
None yet
Milestone
No milestone
3 participants
@deepak1556 @bhavyaus @alexr00