Entries deleted on merge

[janrito]

I renamed an entry using the app without first merging the remote. Additional entries were added using the command line.

When syncing, the app merged the diversion by deleting any entry added through the command line, and only kept the changes added through the app.

[yishilin14]

Emmm this is weird. I cannot reproduce your issue. Could you please provide detailed steps to reproduce? Thank you.

---

I did find some other bugs. Here is what I do.

1. Sync app & command line.
2. Create an entry torename using the command line tool. Sync app & command line.
3. Command line: pass generage new1, pass git push
4. App: rename torename to torename1, sync.

Unexpected outcomes.

1. In GitLab, there are "new1", "torename" and "torename1". There is an extra "torename".
2. In Pass for iOS, there is only "torename1". The entry "new1" is missing.

[christian-weiss]

Outcome 2) this is expected, as you did not pull the commits from remote between step 3 and step 4. Do a wipe up/down to load "new1".

Feel free to vote for #387 to update your local git repo automatically on application start.