After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 169233 - Would be nice to have an "Auto merge" feature for 3-way merges using the ancestor
Would be nice to have an "Auto merge" feature for 3-way merges using the ance...
Status: RESOLVED DUPLICATE of bug 578613
Product: meld
Classification: Other
Component: filediff
0.9.x
Other All
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2005-03-04 19:43 UTC by Tim Macfarlane
Modified: 2009-07-07 06:58 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Tim Macfarlane 2005-03-04 19:43:06 UTC 
Are there any plans to include an 3-way ancestor auto-merge feature, that
automatically merges the changes of two derived files (from a common ancestor)
into a 4th (handling conflicts, etc)?

This feature is available in emacs' ediff (ediff-merge-with-ancestor) and is
extremely useful with source control commit conflicts. Although emacs is great
and all, it's arcane UI can be a little tiresome - i'm hoping Meld could be a
modern alternative...?

Thanks!
Comment 1 Stephen Kennedy 2005-04-01 18:20:25 UTC 
Yes, it is planned to be able to auto merge. In fact all of the logic
is already in place - it's quite a small job to hook it up to the UI.

However, it will be a merge to the ancestor (middle) file, not a 4th
unless you do a "save as".
Comment 2 Gabriel Schulhof 2007-07-22 07:06:47 UTC 
So, is this going to happen anytime soon? This feature is no less useful now than back then. The last release was over a year ago.
Comment 3 Piotr Piastucki 2009-04-19 16:44:17 UTC 
Please take a look at http://bugzilla.gnome.org/show_bug.cgi?id=578797 and let me know your thoughts.
Comment 4 Piotr Piastucki 2009-04-19 19:10:31 UTC 
Wrong URL in the previous comment - please take a loot at http://bugzilla.gnome.org/show_bug.cgi?id=578613 instead.
Thanks,
Piotr
Comment 5 Kai Willadsen 2009-07-07 06:58:40 UTC 
Closing this as a duplicate of bug 578613, since that's where the discussion and patches are. Testing and feedback on the patches there would be much appreciated.

*** This bug has been marked as a duplicate of 578613 ***