Resolve conflicts using mine/theirs can be improved

See the screenshot:

When resolving a merge conflict you always have the option of choosing resolve using mine/theirs, and that works but it can be confusing.

Mine implies my changes, but if you use git-flow and choose close feature the branch develop is checked out and a merge is started with the branch you were working on. The problem here is that now 'mine' is changes from the develop branch. And the changes I just made on my feature branch is considered 'theirs'. This results in quite a bit of confusion when merging.

It you be much better if you dropped the concept of mine and theirs and used branch names instead.

Resolve using 'develop'
Resolve using 'feature/new_view'

I see no drawbacks in this and I would find it much less confusing.