[Bug]: Conflict experience on mobile needs improving

[thany]

Describe the bug

After pulling if there's a conflict, the expierence on mobile is as follows:

• In the staging area, the conflicted file will appear as deleted
• In the changes area, the conflicted file will appear as added
• Both files are identical - although they shouldn't be. Upstream it was completely different.
• Staging or unstaging either means one cancels out the other, because the plugin thinks they're identical
• The little explainer that comes up doesn't work, and uses jargon, whereas on mobile all you got is icons. Nevertheless, the explanation doesn't make the conflict go away.

In my case, there shouldn't even have been a conflict in the first place. It was just a modified file. The file was not changed and committed locally without pushing.

Even if there genuinely is a conflict, which there wasn't but let's say there was, why am I not getting an interface to solve the conflict?

In the end, I just started mashing buttons and eventually the conflict went away. Sorry I don't know what I did to work around it, but frankly, this plugin also doesn't seem to know how to deal with conflicts.

A couple of learning points:

• The buttons in the git panel need a tooltip (by long-pressing them - this is a common pattern)
• The explainer needs to be updated, and shouldn't just say to mash such and such button. That's no way to resolve a real conflict.
• The plugin needs to come with a real merge conflict UI.
• But before that, the plugin needs be able to "have" the conflict between local and upstream, not between local and local.
• There needs to be a force-pull, because in this case, I couldn't give a monkey's arse about what's on local. I just wanted to have whatever is on the remote, be pulled local, without buts.

Relevant errors (if available) from notifications or console (CTRL+SHIFT+I)

Steps to reproduce

Pull with conflicts and be lucky, I guess.

Expected Behavior

No response

Addition context

No response

Operating system

Android

Installation Method

None

Plugin version

2.33.0