Fabric - VS code integration - How to handle conflicts

[Anonymous]

Hi,

I am working on a POC for a client and I have been following the MS guidelines on the vs code integration in Fabric.

I seem to be able to make changes in vs code and "publish" them sucessfully to fabric. Once loaded to Fabric there is an option to accept or reject the edits - super.

My issue is, it doesnt seem to work the other way round. If i make changes in a fabric notebook and commit those changes - when I open vs_code again and try to pull the latest version. The notebook goes into conflict. I only have the option to "merge" the changes - which essentially means I have to reject the changes made on notebook. 

How can I get around this issue? Can I somehow create a branch in vs?

Thanks,

[Anonymous]

Hi @Anonymous ,

Thanks for using Fabric Community.
Can you please explain in detail what is your expectation when you want to pull the code from remote workspace/fabric notebook? 

What was the challenge you are facing while working with pull operation is VS Code? 
If possible try to share screen shots of your issue.

If you can provide the above details, I will be able to help with your query.

Thank you

[Anonymous]

Hello @Anonymous ,

We haven’t heard from you on the last response and was just checking back to see if you have a resolution yet .
In case if you have any resolution please do share that same with the community as it can be helpful to others .
Otherwise, will respond back with the more details and we will try to help .

[Anonymous]

Hello @Anonymous ,

We haven’t heard from you on the last response and was just checking back to see if you have a resolution yet .
In case if you have any resolution please do share that same with the community as it can be helpful to others .
If you have any question relating to the current thread, please do let us know and we will try out best to help you.
In case if you have any other question on a different issue, we request you to open a new thread .