AppCode 3.3 Help

Running AppCode as a Diff or Merge Command Line Tool

In this topic:

Overview

Besides using AppCode as an Integrated Development Environment, you can use it as a command line tool for comparing and merging files.

Comparing files using AppCode as a diff command line tool

To compare two files using AppCode as a diff command line tool

  1. Enable invoking AppCode operations from the command line.
  2. Type the following command at the command line prompt:
    <AppCode launcher> diff <path to file1> <path to file2>
    where file1 is your local copy, file2 is the repository version.

Merging files using AppCode as a command line tool

Most often you need to merge three versions of the same file: your local version, the version in the repository or in the upstream, and the base revision, which is the origin for the two diverged versions.

To merge files using AppCode as a command line tool

  1. Enable invoking AppCode operations from the command line.
  2. Type the following command at the command line prompt:
    <AppCode launcher> merge <path to file1> <path to file2> <path to file3> <path to output>
    where file1 is your local copy, file2 is the repository version, file3 is the base revision for file1 and file2, and output is the file to save the merge results in (optional).

See Also

Last modified: 10 February 2016