sonic-pi

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

C++

Code. Music. Live.

Rugged::Index#conflict_get

Return index entries from the ancestor, our side and their side of
the conflict at +path+.

If +:ancestor+, +:ours+ or +:theirs+ is +nil+, that indicates that +path+
did not exist in the respective tree.

Returns nil if no conflict is present at +path+.

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_get-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_get"

# 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_get-for-pr

hub pull-request

# Celebrate!