Thanks, Kai. On Linux, I use meld for file diff lot (since kdiff3 cannot edit file when comparing).
4 panes mean: in the upper part of the window, there are 3 panes (3 columns). In the lower part of the window, there 1 pane. You can google "kdiff3 git merge" to see what it looks like. I thought 3 ways / 4 panes merge tools such as kdiff3, gvim, p4merge, beyond compare 4 are more advanced than 3 ways / 3 panes merge tools, such as meld. So actually, i did not try meld for git merge yet. Thanks, Kevin On Fri, Mar 8, 2019 at 12:47 PM Kai Willadsen <kai.willad...@gmail.com> wrote: > On Fri, 8 Mar 2019 at 18:58, Kevin Gao via meld-list <meld-list@gnome.org> > wrote: > >> Kdiff3 / gvim and other popular merge tools have 4th pane when doing 3 >> way merge (in git). >> >> Could you please add 4th pane please? (The 4th pane in the bottom) >> > > I'm honestly having trouble with that screenshot, but I *think* that the > bottom pane is the merged output? in which case I think what you're asking > for is instead to add the middle pane (i.e., the common ancestor). > > That seems like a big change to our merge model, which is to present the > two sides and the merged output as the central pane. > > Have you tried starting a conflict resolution from Meld itself (i.e., > running `meld .` in the repository where you have a conflict and opening > the conflicting files)? That gives you an IMO better view where the middle > pane shows the pre-merged code, but substitutes the common ancestor for > actually conflicting chunks. I realise that this isn't what you're asking > for, but it *might* be good enough. > > cheers, > Kai >
_______________________________________________ meld-list mailing list meld-list@gnome.org https://mail.gnome.org/mailman/listinfo/meld-list
