Doing a manual merge of conflicted files doesn't (offer to) finalize the changes

Bug #1051833 reported by Dražen Lučanin
This bug affects 2 people
Affects Status Importance Assigned to Milestone
Bazaar GTK+ Frontends

Bug Description

I would like to second Yannick's report in this question:

> [...] I can solve conflicts within Meld and save the result, [but] when I close Meld, I still can't commit, because BZR still always complains there are conflict.
> Bazaar Explorer does not automatically remove file.BASE, file.OTHER and [rename] file.THIS when conflicts are resolved from Meld. You have to request an Automatic Merge for that to be done.

Expected behaviour
One of the following:
- after doing a manual merge, bazaar should either do an auto-merge right away to remove the .BASE and .OTHER files and rename .THIS as the main file or (maybe better, to prevent accidental deletion)
- there should be a button with something like "apply merge" to achieve the above that a user should click and an extra dialog to warn the user that this will take file.THIS as the main, resolved file and delete the other two. As an extra touch, a power user can check a "don't warn me about this again" box :)

Revision history for this message
Alexander Belchenko (bialix) wrote :

The original question asks about behavior of gconflicts dialog which comes to Bazaar Explorer from bzr-gtk plugin. I think that should be fixed in gconflicts rather than in explorer.

affects: bzr-explorer → bzr-gtk
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers

Related questions