JustinWalsh
|
Resolving Conflicts, Use Mine or Theirs - 2007/06/26 15:04
Loving the ZigVersion.
The only feature request that I have would be to take a file in conflict and choose to overwrite it with the server's copy or overwrite it with the local copy, resolving the conflict as well.
This could be something as simple as a context menu item for the item in conflict.
Maybe I am missing something by not having an external tool that does this for me, but I recall using this feature in tortiseSVN on windows very often.
Thanks.
|
