passforios
passforios copied to clipboard
mssun
Additional button for Git Pull action
I am facing the issue with git sync action. I am trying to sync the repo, and it says it has conflicts. Conflicts, because I have two devices, and there are some remote commits which need to be pulled. Those remote commits are related to different files than local commits, so no UI for conflicts resolving needed.
So there is no way to fix those "conflicts" on this app. The solution is to Pull the new remote commits at first, and then to Push the local commits.
The solution is to Pull the new remote commits at first, and then to Push the local commits.
I think this is exactly what the sync action does - it first pulls then pushes.
This app has never intended to be a Git client. So it's totally overtaxed by conflicts no matter how complicated they seem to be. My recommendation is to bring your remote branch in a state which the app can easily sync with.
I believe the bug remains since 2019. https://github.com/mssun/passforios/issues/315
I don't think think it's a solution for a problem but yet https://github.com/mssun/passforios/issues/315#issuecomment-539552331
@SimplyDanny I suggested the additional button for pulling as it was on my Android's app for Password Store, and I hadn't any issues with git sync. But I got your point. If the git sync wasn't buggy, it would be working the same correct way.