This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
In my work we often do merge between two branches. Most of it required that I merge only my files. Netbeans provides this in "Merge Form: On Repository Folder" and it is very nice. But, when i choose "show changes" on merged branch i see not only my files but many others. Those files has not changed content at all but they has changed mergeino porperty. NOW: I need a filter (or search panel) that would allow me to select my files, in "show changes" view, with differing content of those that have a changed property mergeinfo only, so I could do commit in nice and easy way.
hm, a possible workaround for you would be: open the diff view for a context -> sort by the property column -> multiselect files w/o the mergeinfo prop -> righ-click the selection -> commit
(In reply to comment #1) > hm, a possible workaround for you would be: > open the diff view for a context -> sort by the property column -> multiselect > files w/o the mergeinfo prop -> righ-click the selection -> commit Hm, in diff view files are always listed twice, so I would see the same file with mergeinfo property (after) and without it (before), so it does not help at all.