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.

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

VS Code sync settings merge conflict between Windows and Linux #111482

Closed
harshlavingia opened this issue Nov 30, 2020 · 4 comments
Closed

VS Code sync settings merge conflict between Windows and Linux #111482

harshlavingia opened this issue Nov 30, 2020 · 4 comments
Assignees
Labels
*duplicate Issue identified as a duplicate of another issue(s) info-needed Issue requires more information from poster settings-sync

Comments

@harshlavingia
Copy link

Issue Type: Feature Request

Currently, VS code supports sign in to Microsoft account and sync all the setting. Now I am using VS Code in Windows and Linux and once I sign in to both account, it creates merge conflict in setting file. Please improve and make it easier for developer.

VS Code version: Code 1.51.1 (e5a624b, 2020-11-10T23:34:32.027Z)
OS version: Windows_NT x64 10.0.19042

@sandy081
Copy link
Member

Merge conflict is shown because your windows and linux machines have different values for some of the settings which cant merge automatically. In this case you have to merge manually and continue sync.

May I know what improvements you are thinking of?

@sandy081 sandy081 added the info-needed Issue requires more information from poster label Nov 30, 2020
@harshlavingia
Copy link
Author

Since windows and linux machines have different values, during the sync, it should maintain separate setting files that allow me to sync Windows VS code version and Linux VS Code version seperately.

@sandy081
Copy link
Member

/duplicate

Ok, seems you need platform specific settings - #5595

@github-actions github-actions bot locked and limited conversation to collaborators Jan 15, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
*duplicate Issue identified as a duplicate of another issue(s) info-needed Issue requires more information from poster settings-sync
Projects
None yet
Development

No branches or pull requests

3 participants
@harshlavingia @sandy081 and others