Tortoise SVN misses to find conflict for file type *.SRW during Merge
Saravanan Chandrasekaran via TortoiseSVN-dev <[email protected]>
| Newsgroups | gmane.comp.version-control.subversion.tortoisesvn.devel |
|---|---|
| Message-ID | <[email protected]> |
Hello,
We are using .SRW file type which is an window object in
Powerbuilder application. For some reasons, TortoiseSVN is unable to find
the conflict during merge process, doesn't prompt for conflict or
identifies conflict resolution on this file type and hence it simply
overrides the content from the source. But when I try the same file type
using SVN merge command line tool, the conflict is prompted. So below are
my queries.
1. Is there a settings in Tortoise to run like the same SVN merge command
line tool does?
2. I Hope Tortoise internally uses the SVN merge commands and not its own.
3. Does Tortoise bypass the conflict internally due to some file types & is
there a place to configure to accept merge conflict based on file types or
content type?
Appreciate the team inputs.
Many Thanks,
Saravanan
--
You received this message because you are subscribed to the Google Groups "TortoiseSVN-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn-dev/73ea1d9d-7907-4c49-9394-c3dd20524a69n%40googlegroups.com.