6

I usually work on someone else's code base on a remote system and often need to merge code from two different files. For that I have to pull files to my system and meld it and push it back to the remote system. Is there any better way to do it through the terminal itself? (i.e. Terminal and command-line equivalent of Meld Diff Viewer)?

2

2 Answers 2

6

How about Vimdiff?

http://www.thegeekstuff.com/2010/06/vimdiff-file-diff-tool/

It might not look as fancy as Meld, but it looks like a great option for visual diffing in terminal.

1
  • So much better than meld, no GTK lib issues!
    – MikeyE
    Aug 15, 2018 at 20:53
2

Sounds like the perfect use for a distributed version control system like either git or Mercurial.

A very good tutorial for Mercurial is available here:

http://hginit.com

2
  • … or any revision control system for that matter. Dec 14, 2013 at 22:21
  • 3
    Thanks for suggestion. But i am already using git and wanted to merge two files with same name. I think vimdiff what i needed as @Tobberoth suggested. Dec 19, 2013 at 6:58

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Not the answer you're looking for? Browse other questions tagged or ask your own question.