Hi,
Merging is not happening for word documents.
I have installed
VisualSVN server. and TortoiseSVN in my system and my friends is istalled only
TortoiseSVN version. We are working over a network.
I have added a
word doc. file to repocitory and my friend get the latest.
Both of then are
read and modified same file.
My friend has
commited the word doc file.
When I'm
committing the file, it is showing conflicts.
How to resolve the
situation? Is MERGE is happening for all types of file?
Thanks
S.A.K
Jilani
Software Paradigms (I)
pvt., Ltd
Cell : 91-
9980561355