Marin

Amazing, thanks for getting on this fast @yishilin14!

workaround: 1. On your computer: - `cd /path/to/your/passwords` - `git push` (make sure your computer and remote are clean) - `git checkout -b conflicts` 2. On your phone: - Open...

I think those are workarounds for a symptom that needs to be solved in the first place. I believe the core of the issue is merge strategy. Your computer's git...

@kenny-evitt it's doing `git pull`, which is equivalent to `git fetch` and `git merge`. When you pull to refresh it's "Syncing", and there's no Sync with git. In this particular...

tl;dr - I don't think normal users should have more than 1 branch if they're not doing super advanced stuff, and things should "just work" on their end.

> But, personally, I've run into this because I changed a password twice, once from my phone, updating it in this app, and again, at a different time, from one...

@ricobeck i recommend vendoring stuff manually (at least in a branch) for now, and avoiding CocoaPods until we support binary distribution. I'll put it on the priority list.

@Lassulus any plans to fix this for qcow?

Tested, left comment on the PR

Good job, thanks @Lassulus!