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 annoying when I pick Compare and Merge as I'm trying to compare and decide which one I would like to proceed. But apparently when you click on Compare and Merge, it allows you to compare but you're required to merge. I'm unable to cancel the merge if I try to. Closing the tab doesn't solve the issue. It will only say in Conflict mode for the notebook selected.

Is there any explanation or fix for this issue?

Thanks

data engineering
environment
notebook

1 Reply

  • Kagiyama_yutaka's avatar
    Kagiyama_yutaka
    Icon for Continued Contributor rankContinued Contributor
    18 hours 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.