sonic-pi

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

C++

Code. Music. Live.

Rugged::Index#conflicts

Return all conflicts in +index+.

Each conflict is represented as a Hash with +:ancestor+, +:ours+ or
+:theirs+ key-value pairs, each containing index entry data.

If the value of the +:ancestor+, +:ours+ or +:theirs+ key is +nil+,
that indicates that file in conflict did not exists in the respective tree.

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-conflicts-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#conflicts"

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

hub pull-request

# Celebrate!