"Edit Conflicts" for Excel Files

[Ömer GÜNDÜZ]

Hello,

I am searching for an effective solution to edit conflicts in Excel files. So, I've installed the "Spreadsheet Compare" add-ins owned by Stevetowner (https://sourceforge.net/projects/spreadshcompare/) to my Excel. It is successful in visualizing the differences between two Excel files. However, I cannot integrate and use it for edit conflicts with TSVN. Would you happen to have any suggestions? Is it possible to call add-ins with TSVN scripts?

Thnx in advance.

[Daniel Sahlberg]

Have you checked the user manual section on how to configure external diff / merge tools? 

https://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-settings.html#tsvn-dug-settings-progs 

You might have to write a custom wrapper (the existing ones for merging Word documents should be a good starting point) to open Excel and configure the addin.

Kind regards,

Daniel

[Ömer GÜNDÜZ]

Hello again,

Thank you very much for your answer, Daniel. 

After facing challenges in finding an effective conflict resolution method, I have opted to utilize my workspace within the OneDrive folder. This approach allows us to collaborate on a shared file, with the file owner handling the commits for the team. I am curious if there are potential issues associated with this method. Has anyone encountered challenges using this approach (i.e. TSVN icons will not show up)? Additionally, do you recommend employing TSVN within the OneDrive environment?

Thank you in advance for your help

--
You received this message because you are subscribed to a topic in the Google Groups "TortoiseSVN-dev" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/tortoisesvn-dev/O761YqWwoNw/unsubscribe.
To unsubscribe from this group and all its topics, send an email to tortoisesvn-d...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/2727efbc-3662-4719-b4f8-4506138f385bn%40googlegroups.com.

[Daniel Sahlberg]

lördag 18 november 2023 kl. 22:13:20 UTC+1 skrev Ömer GÜNDÜZ:

Hello again,

Thank you very much for your answer, Daniel. 

After facing challenges in finding an effective conflict resolution method, I have opted to utilize my workspace within the OneDrive folder. This approach allows us to collaborate on a shared file, with the file owner handling the commits for the team. I am curious if there are potential issues associated with this method. Has anyone encountered challenges using this approach (i.e. TSVN icons will not show up)? Additionally, do you recommend employing TSVN within the OneDrive environment?

Thank you in advance for your help

Just so I understand, have you put the complete working copy on OneDrive? I have not tried, but if several persons performing SVN actions on that folder, I would imagine that OneDrive will encounter conflicts on the databases and files within the .svn administrative folder. That is probably a BAD idea.

The Subversion approach to non-mergeable binary files is to use locking, see the description of svn lock in the svn book [1]. This can be enforced by the svn:needs-lock property, see [2]. That way you don't have any merge conflicts, at the cost of only one person being able to work on a particular file at each time.

Kind regards,

Daniel

[1] https://svnbook.red-bean.com/en/1.7/svn.advanced.locking.html

[2] https://svnbook.red-bean.com/en/1.7/svn.ref.properties.html#svn.ref.properties.versioned-props

[Ömer GÜNDÜZ]

1) "I would imagine that OneDrive will encounter conflicts on the databases and files within the .svn administrative folder. That is probably a BAD idea."

Actually, I have concerns about this too. However, I will give it a try and see the results on a relatively easy project.

2) "The Subversion approach to non-mergeable binary files is to use locking, see the description of SVN lock in the SVN book [1]. This can be enforced by the svn:needs-lock property, see [2]"

Lock option is also on the table but I am not in favor of letting only one person at each time.

Thank you very much, Daniel. I will let you know about my hybrid (TSVN + Onedrive) approach.

--
You received this message because you are subscribed to a topic in the Google Groups "TortoiseSVN-dev" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/tortoisesvn-dev/O761YqWwoNw/unsubscribe.
To unsubscribe from this group and all its topics, send an email to tortoisesvn-d...@googlegroups.com.

To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/5b0818c3-5f72-4031-ad61-b35734fcc545n%40googlegroups.com.

[Ömer GÜNDÜZ]

Yh TSVN fails in the onedrive environment. Some commands disappear in TSVN and onedrive sync fails in some cases. Locking files before editing is the best option we have so far.

Regards,