sonic-pi

https://github.com/sonic-pi-net/sonic-pi

C++

Code. Music. Live.

Rugged::Tree#merge

tree.merge(other_tree[, ancestor_tree[, options]]) -> Rugged::Index
tree.merge(other_tree[, options]) -> Rugged::Index

Merges two trees and returns the a Rugged::Index object that reflects
the result of the merge.

The following options can be passed in the +options+ Hash:

:renames ::
  If true, looking for renames will be enabled (`--find-renames`).

:rename_threshold ::
  An integer specifying the minimum similarity of a file to be
  seen as an eligible rename source (default 50).

:target_limit ::
  An integer specifying the maximum byte size of a file before a it will
  be treated as binary. The default value is 512MB.

:favor ::
  Specifies how and if conflicts are auto-resolved by favoring a specific
  file output. Can be one of `:normal`, `:ours`, `:theirs` or `:union`.

Source | Google | Stack overflow

Edit

git clone [email protected]:sonic-pi-net/sonic-pi.git

cd sonic-pi

open app/server/ruby/vendor/rugged-1.7.1/ext/rugged/rugged_tree.c

Contribute

# Make a new branch

git checkout -b -your-name--update-docs-Rugged--Tree-merge-for-pr

# Commit to git

git add app/server/ruby/vendor/rugged-1.7.1/ext/rugged/rugged_tree.cgit commit -m "better docs for Rugged::Tree#merge"

# Open pull request

gem install hub # on a mac you can `brew install hub`

hub fork

git push <your name> -your-name--update-docs-Rugged--Tree-merge-for-pr

hub pull-request

# Celebrate!