Forum Discussion
Fabric - VS Code Extension - Conflict Handling
Hi Ban2,
Agreed, the label makes it sound like you can just peek at the differences and back out. Until that changes, one way to get a "cancel" is to make a quick copy of your local notebook before opening Compare and Merge. Then if you decide you don't want to change anything, leave the left side matching your local version and hit Merge. That clears the conflict state without actually changing your code, and you still have the backup if anything looks off.
Skilled SharerI think Compare and Merge opens the diff editor, but closing it does not clear the conflict. Resolve the code or markdown cells on the left, then select Merge in the top-right. Until then, the notebook stays in Conflict.
Hi, thank you very much for the help. But still, it doesn't make sense for it to work how it is at the moment. The Compare and Merge button is kinda misleading in a way.
Thanks for providing a temporary solution until they fixed it or implement new functions.
jubinsoniContinued Contributor
Hi Ban2,
Agreed, the label makes it sound like you can just peek at the differences and back out. Until that changes, one way to get a "cancel" is to make a quick copy of your local notebook before opening Compare and Merge. Then if you decide you don't want to change anything, leave the left side matching your local version and hit Merge. That clears the conflict state without actually changing your code, and you still have the backup if anything looks off.
Hi jubinsoni,
Thank you very much for a better temporary solution.
My team has contacted Microsoft and will be seeing if there's anything can be done to it.