sonic-pi

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

C++

Code. Music. Live.

Rugged::Index#conflict_add

Add or update index entries that represent a conflict.

+conflict+ has to be a hash containing +:ancestor+, +:ours+ and
+:theirs+ key/value pairs. Any of those paris can be +nil+ (or left out)
to indicate that the file was not present in the respective tree during
the merge.

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_index.c

Contribute

# Make a new branch

git checkout -b -your-name--update-docs-Rugged--Index-conflict_add-for-pr

# Commit to git

git add app/server/ruby/vendor/rugged-1.7.1/ext/rugged/rugged_index.cgit commit -m "better docs for Rugged::Index#conflict_add"

# 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--Index-conflict_add-for-pr

hub pull-request

# Celebrate!