[bug] Passwords deleted when merging

[haji-ali]

I am using Pass with a common git repo. An issue I noticed is that when the Pass merges local changes with changes from remote, it deletes any new files in remote and commits the result!

I seem to have a commit "Merge branch 'master'" by "Mobile User" which correctly merges the commits and then the next time I add a password, a commit by "Pass for iOS" deletes the merged files and adds the new one only.

[luk0y]

You can still get the deleted file from the commit history isn't it?

[haji-ali]

Yes, hardly a solution though. I don’t always notice the file deletion until I need the password