qconflicts: Replace local text conflicted file (.THIS) with changes from remote file (.OTHER)

[Craig Hewetson]

Feature Request:
The user would like to have an option to "resolve" a text conflict by replacing his changes (.THIS) with the changes from the server (.OTHER) without having to open the merge tool.

I propose a right click context menu presenting the option:
Replace with remote changes...

The wording is kind of long ... but this action would really useful.

[Alexander Belchenko (bialix)]

Craig Hewetson пишет:
> Public bug reported:
>
> Feature Request:
> The user would like to have an option to "resolve" a text conflict by replacing his changes (.THIS) with the changes from the server (.OTHER) without having to open the merge tool.
>
> I propose a right click context menu presenting the option:
> Replace with remote changes...
>
> The wording is kind of long ... but this action would really useful.

1) Conflicted file has its own extension, not .THIS. Conflicted file has
conflict markers inside, while .THIS is pristine copy of the local file.
2) I think there was proposal in bzr core (from Vincent?) to allow
easier conflict resolution by allowing user to select .THIS or .OTHER as
final version.

So I think we need actually 2 items in the menu (wording needs polishing):

* Replace by .THIS file
* Replace by .OTHER file

3) Talk about server here is not the best idea, because there is
situations when user merge from local branch, without server ;-)

--
All the dude wanted was his rug back