Forum Discussion

Ban2's avatar
Ban2
New Member
1 day ago

Fabric - VS Code Extension - Conflict Handling

Hi, I've been testing out the extension and whenever I there is a conflict, I'll be prompt to either pick the Local version, Virtual Workspace version or the Compare and Merge. It has been quite an...
data engineering
environment
notebook
Kagiyama_yutaka's avatar
Kagiyama_yutaka
Icon for Continued Contributor rankContinued Contributor
1 day ago

I 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.

Ban2's avatar
Ban2
New Member
4 hours ago

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.