#10 3-way merge

open
nobody
None
5
2009-09-25
2009-09-25
Wil Cooley
No

It would be nice if pwsafe supported the ability to do a 3-way merge. If one were using pwsafe with a sysadmin team to share system passwords, for example, one could store the binary database with a regular revision-control tool such as Subversion and use a 3-way merge to incorporate changes from the server into a working copy, before then committing the database. Currently, when one pulls down updates, it is necessary to manually accept changes from the server, which is error-prone and a little confusing. It would be extra nice if it could be used as a 'diff3' replacement, so that it could be used with 'svn update --diff3-cmd ARG'.

Discussion


Log in to post a comment.