Forum Discussion

Ban2's avatar
Ban2
New Member
23 days ago
Solved

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
  • jubinsoni's avatar
    jubinsoni
    20 days ago

    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.

4 Replies

  • Kagiyama_yutaka's avatar
    Kagiyama_yutaka
    Icon for Skilled Sharer rankSkilled Sharer
    22 days 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
      21 days 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.

      • jubinsoni's avatar
        jubinsoni
        Icon for Continued Contributor rankContinued Contributor
        20 days ago

        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.