sonic-pi

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

C++

Code. Music. Live.

Rugged::Repository#merge_analysis

Analyzes the given commit and determines the opportunities for merging
it into the repository's HEAD. Returns an Array containing a combination
of the following symbols:

:normal ::
  A "normal" merge is possible, both HEAD and the given commit have
  diverged from their common ancestor. The divergent commits must be
  merged.

:up_to_date ::
  The given commit is reachable from HEAD, meaning HEAD is up-to-date
  and no merge needs to be performed.

:fastforward ::
  The given commit is a fast-forward from HEAD and no merge needs to be
  performed. HEAD can simply be set to the given commit.

:unborn ::
  The HEAD of the current repository is "unborn" and does not point to
  a valid commit. No merge can be performed, but the caller may wish
  to simply set HEAD to the given commit.

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

Contribute

# Make a new branch

git checkout -b -your-name--update-docs-Rugged--Repository-merge_analysis-for-pr

# Commit to git

git add app/server/ruby/vendor/rugged-1.7.1/ext/rugged/rugged_repo.cgit commit -m "better docs for Rugged::Repository#merge_analysis"

# 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--Repository-merge_analysis-for-pr

hub pull-request

# Celebrate!