Menu
I want to resolve some conflicts of an SVN file using Meld. I'm using the Head version and my version to resolve the conflicts. I am unable to find how to do the merge operation and resolve the conflicts. When i'm right clicking on the line, i just see copy, paste, cut, create patch copy to right, copy to left options. Is there any way to do "Copy this line after mine" or "copy this line before mine" like that?? I used WinMerge when i was working on Windows. Now i moved to a Ubuntu machine and facing this situation for the first time. Please help me how to resolve the conflicts using Meld.
Thanks in advance
252
If you start Meld from the command line, you can tell it what to do when it starts. For a two- or three-way file comparison, start Meld with meld file1 file2 or meld file1 file2 file3 respectively. For a two- or three-way directory comparison, start Meld with meld dir1 dir2 or meld dir1 dir2 dir3.
To use this feature, launch Meld, look to the start-up screen, and click the “directory comparison” button. After selecting “directory comparison”, two boxes with “none” will appear. Click on both of the boxes and use the menu to set the folders you're trying compare.
Meld is the visual diff and merge tool of GNOME, targeted at developers. It allows users to compare two or three files or directories visually, color-coding the different lines. Meld.
With Meld 1.4.0 or earlier, you need to hold down Ctrl and click on the arrows in the bar between the panes.
With Meld 1.5.0 or later, there are items in the main menu for "Copy above/below left/right" that do what you're looking for. You can also use keyboard shortcuts (Alt+ [, ], ;, and '), or use the middle bar as above.
142
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
