Latest 0.1.0
Homepage https://github.com/hectr/strings-file-merge-driver
License MIT
Platforms osx , ios , tvos , watchos
Authors

Installation

Using Mint

To install the latest version of strings-file-merge-driver simply run this command:

$ mint install hectr/strings-file-merge-driver

Using CocoaPods

Add pod 'strings-file-merge-driver' to your Podfile and run pod update strings-file-merge-driver. This will download the latest release binary and will allow you to invoke it via $PODS_ROOT/strings-file-merge-driver/bin/strings-file-merge-driver in your Script Build Phases.

Usage

strings-file-merge-driver [--help | ancestor_file current_file other_file conflict_marker_size dest_pathname] [--verbose] [--silent] [--discard-invalid-lines]

To use this merge driver, add a section to your $GIT_DIR/config file (or $HOME/.gitconfig file) like this:

[merge "strings-file"]
name = Strings file merge driver
driver = strings-file-merge-driver --discard-invalid-lines --silent %O %A %B %L %P

Then add this to .gitattributes:

*.strings   merge=strings-file

When the command line is built, the tokens in merge.*.driver variable will be replaced with:

  • %O = name of the temporary file that holds the contents of ancestor’s version
  • %A = name of the temporary file that holds the contents of current version
  • %B = name of the temporary file that holds the contents of other branches’ version
  • %L = conflict marker size
  • %P = pathname in which the merged result will be stored

The merge driver is expected to leave the result of the merge in the file named with %A by overwriting it, and exit with zero status if it managed to merge them cleanly, or non-zero if there were conflicts.

Read more about git merge drivers.

MIT License. See LICENSE for details.

Latest podspec

{
    "name": "strings-file-merge-driver",
    "version": "0.1.0",
    "summary": "A custom git merge driver for strings files.",
    "homepage": "https://github.com/hectr/strings-file-merge-driver",
    "license": {
        "type": "MIT",
        "file": "LICENSE"
    },
    "authors": {
        "Hu00e8ctor Marquu00e8s": "[email protected]"
    },
    "social_media_url": "https://twitter.com/elnetus",
    "source": {
        "http": "https://github.com/hectr/strings-file-merge-driver/releases/download/0.1.0/strings-file-merge-driver.zip"
    },
    "preserve_paths": "*",
    "exclude_files": "**/file.zip",
    "platforms": {
        "osx": null,
        "ios": null,
        "tvos": null,
        "watchos": null
    }
}

Pin It on Pinterest

Share This