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
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.