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

Bug #574357 reported by Craig Hewetson on 2010-05-03
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
QBzr
Low
Unassigned

Bug Description

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.

summary: - qconflicts: Replace text conflicted file with changes from .THIS or
- .OTHER or .BASE file.
+ qconflicts: Replace local text conflicted file (.THIS) with changes from
+ remote file (.OTHER)

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

Changed in qbzr:
status: New → Confirmed
importance: Undecided → Low
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers