Results 1 to 4 of 4

Thread: How do I merge two source code files?

  1. #1
    Join Date
    Jul 2005
    Location
    UC Irvine
    Beans
    342
    Distro
    Ubuntu 9.04 Jaunty Jackalope

    How do I merge two source code files?

    Hey everyone,

    I have two files fileA and fileB that depend from common ancestor file. I do not have access to that common ancestor file, just these two children. (So I can't use diff3) How do I merge these two different files? Thanks.

  2. #2
    Join Date
    Jun 2011
    Location
    United Kingdom
    Beans
    Hidden!
    Distro
    Lubuntu Development Release

    Re: How do I merge two source code files?

    If I'm getting you right, fileA and fileB do not necessarily have the same information that the ancestor, fileC, has, so you can't. No version control?

  3. #3
    Join Date
    Nov 2007
    Location
    London, England
    Beans
    5,575
    Distro
    Xubuntu 14.10 Utopic Unicorn

    Re: How do I merge two source code files?

    I find meld very good for comparing two files and combining them. It's in the repositories.
    meld file1 file2

  4. #4
    Join Date
    Jul 2005
    Location
    UC Irvine
    Beans
    342
    Distro
    Ubuntu 9.04 Jaunty Jackalope

    Re: How do I merge two source code files?

    Thanks. meld looks like it might do the job.

Bookmarks

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •