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

Conflicts is shown even though it should not be #89735

Closed
sandy081 opened this issue Jan 30, 2020 · 0 comments
Closed

Conflicts is shown even though it should not be #89735

sandy081 opened this issue Jan 30, 2020 · 0 comments
Assignees
Labels
bug Issue identified by VS Code Team member as probable bug settings-sync verified Verification succeeded
Milestone

Comments

@sandy081
Copy link
Member

sandy081 commented Jan 30, 2020

  • Start fresh on two machines (Turn off completely)
  • Have following settings on machine 1
{
	"workbench.colorTheme": "Default Dark+",
	"configurationSync.store": {
		"url": "http://localhost:3000",
		"authenticationProviderId": "MSA"
	},
}
  • Have following settings on machine 2
{
	"workbench.colorTheme": "Default Dark+",
	"configurationSync.store": {
		"url": "http://localhost:3000",
		"name": "Visual Studio Code",
		"account": "Microsoft",
		"authenticationProviderId": "MSA"
	},
}
  • Machine 1: Turn on Sync
  • Machine 2: Turn on Sync and continue to merge.
  • Machine 1: Change theme

🐛 Switch to Machine 2 - Conflicts are shown. Instead Theme should be updated.

@sandy081 sandy081 added bug Issue identified by VS Code Team member as probable bug settings-sync labels Jan 30, 2020
@sandy081 sandy081 added this to the January 2020 milestone Jan 30, 2020
@sandy081 sandy081 self-assigned this Jan 30, 2020
@aeschli aeschli added the verified Verification succeeded label Jan 31, 2020
@vscodebot vscodebot bot locked and limited conversation to collaborators Mar 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Issue identified by VS Code Team member as probable bug settings-sync verified Verification succeeded
Projects
None yet
Development

No branches or pull requests

2 participants