Merge issues from VS Code(Bitbucket Plugin)

[Manoj Reddy]

Hi Team,

When we perform the git actions to resolve the conflicts between two small branches(like 10 files in each) the VSCode UI does show me the merge changes, staged changes; however, when the same action is done between high volume branches(i.e. it has more number of file in both or one branch) it does show the conflicted files over terminal but not on the sidebar section as Merge changes. A few times, it just hangs for over an hour and we end up killing the task. Please see screenshots below for additional details. We are using the open source version of visual studio and we learnt from Manaswi from MSFT that using the professional version wouldn’t alter the behavior much either. We have raised tickets with both MSFT (https://github.com/microsoft/vscode/issues/126217) and Atlassian (SSP-49366_). Please see attachment for further details._

To replica the issue in one branch 10 files and the other branch 10000 files.

Attached the screen shots as well.

‌

‌

Thank you!!

Manoj

[Jonathan Doklovic]

Hi Manoj!

After reviewing the screenshots you attached, it seems the issue is with the Source Control Explorer in VS Code. This is a built-in panel that ships with VS Code and should not be affected by any extensions. I do know that VS Code internally uses Javascript Git bindings (instead of shelling out) and we’ve seen performance issues with these bindings in the past.

Here are a few things you can do to verify your scenario:

• Install a “clean” version of VS Code without adding any extensions and try to view the same conflicts. In theory, you should get the same errors/sluggishness.
• Try to recreate the same situation with a Github repo. This is really just to rule out any Bitbucket perf issues.
• If both of the above work without issue, I would go through a cycle of trying to view conflicts, then disable a single extension and try to view conflicts again. I would repeat this process disabling extensions one-by-one until you find the offending extension. This should be a last resort though, as I do believe this is a corr VS Code issue and not caused by any extensions.

Let us know how it goes!

Thanks!

‌

[Prabhakar S]

Hello Jonathan

Thanks for your response, Please find my answer inline

‌

Here are a few things you can do to verify your scenario:

• Install a “clean” version of VS Code without adding any extensions and try to view the same conflicts. In theory, you should get the same errors/sluggishness.

This we have already performed Reinstalled the Plugin in VS with default one

• Try to recreate the same situation with a Github repo. This is really just to rule out any Bitbucket perf issues.

As the Repos are code related we will not be able to place in GIT-hub and test Also, this happening only for the repositories which have a large component with conflicts other repositries are workingas expected

Also, we added the Support.zip file in the initial request which was logged in Bitbucket portal https://getsupport.atlassian.com/servicedesk/customer/portal/24/SSP-49366,

‌

Let us if any further information needed,

Thanks & Regards
Prabhakar

[Jonathan Doklovic]

Hi Prabhakar,

When you installed the clean version of VS Code, did you have the same issue?

[Prabhakar S]

Hi Jonathan,

We did have the same issue after Re-Installing the Plugin too.

Also due to security concern, we will not abe to upload the data in GIT hub and reproduce the issue

[Prabhakar S]

Hi Jonathan,

Could help us in resolving this request quickly

‌

Thanks & Regards

Prabhakar

[Jonathan Doklovic]

Hi Prabhakar,

Unfortunately, this seems like a VS Code issue with the source control panel. The Atlassian extension doesn’t contribute to that view at all.

I would try contacting the VS Code team again via their github repo. https://github.com/microsoft/vscode

Sorry I can’t be of more help.

[Mars KIM]

Hi, I have a relavant issue. From about two weeks ago, attached photo happens whenever I tried to merge PR.

However, the PR merge is done quite a bit later (more than a minute) but related Jira card transitions are not working, even later.

atlassian.atlascode: v2.9.1

vscode: v1.57.1

thanx!