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 150063 - Show only conflicts
Show only conflicts
Status: VERIFIED DUPLICATE of bug 150178
Product: meld
Classification: Other
Component: general
0.9.x
Other Linux
: Normal enhancement
: ---
Assigned To: Stephen Kennedy
Stephen Kennedy
Depends on:
Blocks:
 
 
Reported: 2004-08-13 16:40 UTC by Ben Bucksch
Modified: 2009-08-15 18:40 UTC
See Also:
GNOME target: ---
GNOME version: ---


Description Ben Bucksch 2004-08-13 16:40:04 UTC 
If you merge a huge tree, it's essential for usability to have to care about
real conflicts only (esp. in the dirview), I can't wade through 30000
modifications. I didn't find a way to show only conflicts and have the rest of
the patches be applied automatically.
Comment 1 Stephen Kennedy 2004-08-13 17:00:00 UTC 
Meld currently doesn't do any automatic merging, though most of the machinery is
already in place. Also as 

Do you know of any gui tools which do this already?
Comment 2 Ben Bucksch 2004-08-13 17:43:15 UTC 
> Also as

...?

> Do you know of any gui tools which do this already?

I don't know, I am currently looking for one that works for me.

(Are you on IRC? I am currently logged into #gnome on OPN/FreeNode as benb.)
Comment 3 Stephen Kennedy 2006-05-27 23:22:14 UTC 
This is better described as part the not-yet-existant patch mode.

*** This bug has been marked as a duplicate of 150178 ***
Comment 4 Stephen Kennedy 2006-11-19 11:05:58 UTC 
Batch close of old bugs.