Comments (5)
For reference, I see:
No merge editor button, none of the palette buttons do the thing I'm looking for.
from vscode.
Glad to hear you like the merge editor! ❤
I think you can configure VS Code as merge tool in git (there are CLI options to pass base/input1/input2/result paths to VS Code).
Then git merge tool
(or a similar command) will open the merge editor of VS Code.
@lszomoru Can we do something here?
from vscode.
This feature request is now a candidate for our backlog. The community has 60 days to upvote the issue. If it receives 20 upvotes we will move it to our backlog. If not, we will close it. To learn more about how we handle feature requests, please see our documentation.
Happy Coding!
from vscode.
@jakebailey, thanks for the screenshot. The "Source Control" view is being rendered by running git status
and then parsing the output. Given the screenshot, what I am suspecting is that your are in a state in which running git status
returns more than 10,000 entries hence we show a warning. Could you confirm that? Could you try setting the git.statusLimit
setting to 0
in order to remove this limit. Did that help? Thanks!
Adding @chrmarti as well since he owns the merge conflict codelenses.
from vscode.
Setting "git.statusLimit": 0
allowed the source control page to load:
When opening a file manually in the editor, I now get the button bottom right:
And clicking on the conflicted file in the source control pane also works to open the merge editor.
Verifying without the setting, the source control page never loads and the button never appears, so my test case is at least good.
If you want to test this yourselves, I've pushed https://github.com/jakebailey/TypeScript/tree/merge-testing up; doing git merge main
creates the 20000 file merge.
It sounds like I can leave this setting on; even when I set it to zero, the UI was responsive and working fine.
One thing I'm wondering here is whether or not it would be worth it for VS Code to instead use something like git diff --name-only --diff-filter=U
or git diff --check
to get a list of conflicting files, in the case where it can't parse out the status. But if setting the status limit to 0 to allow unlimited parsing works fine, that's also good and I'll keep using it in the meantime!
Offering the button on files with merge conflict markers would also be pretty helpful; that doesn't require any additional git parsing as VS Code already sees those markers and handles them for other UI...
from vscode.
Related Issues (20)
- Source control (and git integration) unresponsive after update to 1.91.1
- Persistent keys are not handled correctly on Windows
- shift+cmd+t not working HOT 1
- lost git, search HOT 2
- Target size of buttons "Clear extension" and "Filter extension" is 20X20 which is less than required size 24x24pixel: A11y_VS Code_Extension_Target Size HOT 2
- Target size of Send(22X22) and more(16X22) buttons available under copilot chat sendbox is less than required size 24x24pixel: A11y_VS Code_Copilot Chat_Target Size
- Goto location in next existing split
- [.GET!!~~.] TEENPATTI APK + TEENPATTI GOLD WITH TEENPATTI REAL CASH [UPDATED!!]`` - YHXDS
- underscores hidden in terminal command prompt HOT 2
- Comment Pirater Snapchat facilement en ligne sans logiciel
- Comment Pirater Snapchat en ligne gratuitement
- 'crashed', code: '5' (Every 10 minutes) HOT 1
- 'More Actions' context menu Inconsistency
- TS Server fatal error: Cannot find module 'typia/lib/transform' HOT 1
- Progress Bar HOT 2
- CLI error everytime I open a document HOT 1
- Morni cloud
- Andoka Cloud
- Hackear Instagram real Suceso 2024
- Always running as administrator HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from vscode.