How can I switch from conflicting-main-... back to main #2842
Description
Some days ago I tried forgot to git pull before I created a new password using the Android Passwordstore App. As a result I seem to have gotten a conflicting rebase situation. I am certain that the remote main is in the desired state and would like to simply tell the app to just continue to use it.
I tried to click the hard reset to remote branch button a few times, but to no avail. I then gave in and clicked abort rebase and push new branch. After that, a new branch appeared, conflicting-main-1704023617699. Since I didn't want to use its contents, I removed it using Git on a Linux desktop: git push --delete origin conflicting-main-1704023617699.
The app told me that after resolving the situation, it would continue to use master. I read master to be meant "whatever is the default branch". I hoped that the app would recognise things as resolved if the branch conflicting-main-1704023617699 disappeared. Apparently, that hasn't happened.
Now I am in a situation that I cannot receive new passwords. Also, I am unable to switch branches. I would like to know what I could do to resolve this situation.