[2013-07-30 10:32:40 +0100] Paul Gideon Dann:
On Tuesday 30 Jul 2013 10:58:21 Chris Down wrote:
I run a couple of Arch servers, and I'm trying to teach someone how to go about maintaining it (for when I'm not around). The difficulty is that when it comes to package updates that require merging .pacnew files, I always use Vim to merge changes. That's quite a steep learning curve to impose on someone who's not all that familiar with a UNIX environment yet. Does anyone know of any good & simple(ish) alternative for merging files over SSH? Well, what merge programs are they familiar with? If it is vimdiff that
On 2013-07-30 09:43, Paul Gideon Dann wrote: poses the problem for this user, you might consider running meld instead.
Thanks Chris, but this is a headless server; Xorg is not installed, so meld is out.
You could mount the server's filesystem locally using sshfs and run meld on that. But in my opinion learning to use a powerful text editor is really a must for system administrators... -- Gaetan