[bug] Passwords deleted when merging

mssun / passforios

Pass for iOS - an iOS client compatible with Pass command line application.

https://mssun.github.io/passforios

MIT License

1.5k stars 102 forks source link

[bug] Passwords deleted when merging #638

Open haji-ali opened 6 months ago

haji-ali commented 6 months ago

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 commented 3 months ago

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

haji-ali commented 3 months ago

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