Stuck on an issue?
Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.
And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.
Hang on merge conflicts
See original GitHub issue- VS Code Version:
Version: 1.71.0
Commit: 784b0177c56c607789f9638da7b6bf3230d47a8c
Date: 2022-09-01T07:36:10.600Z
Electron: 19.0.12
Chromium: 102.0.5005.167
Node.js: 16.14.2
V8: 10.2.154.15-electron.0
OS: Windows_NT x64 10.0.22000
Sandboxed: No
- OS Version: Windows 11.
Steps to Reproduce:
- Open and try to merge conflicts. Only hang for this specific one:
- Not repro in Visual Studio:
Conflict
Issue Analytics
- State:
- Created a year ago
- Comments:5 (2 by maintainers)
Top Results From Across the Web
Visual studio hangs while fixing merge conflicts
Fix the merge conflicts(in visual studio) one by one by opening them and clicking on the conflict checkbox you need to have, and...
Read more >Git merge freezes after solving all conflicts in one file - YouTrack
3. right click on a conflicting file and choose git-> resolve conflicts 4. from the list of the conflicting files, select one file...
Read more >Stuck at "A merge operation in progress" - Stack Overflow
When get conflicts during a pull action from remote Git repository in Visual Studio, you need to do a manual merge ...
Read more >Merge conflicts - GitLab Documentation
Go to your merge request. · Select Overview, and scroll to the merge request reports section. · Find the merge conflicts message, and...
Read more >How to resolve a git merge conflict - Opensource.com
Merge conflicts are going to happen on teams of any size, given enough time. It's important to be able to resolve them with...
Read more >
Top Related Medium Post
No results found
Top Related StackOverflow Question
No results found
Troubleshoot Live Code
Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free
Top Related Reddit Thread
No results found
Top Related Hackernoon Post
No results found
Top Related Tweet
No results found
Top Related Dev.to Post
No results found
Top Related Hashnode Post
No results found
I see. I am not 100% sure this is accurate, but this is my best bet for the base: https://github.com/xiaomi7732/ApplicationInsights-Kubernetes/blob/6b19fd5f414dbc8653a3b8ab445c6576d186575f/src/ApplicationInsights.Kubernetes/Extensions/KubernetesServiceCollectionBuilder.cs#L1
Base is the common ancestor file of both commits.