The repository "seed-fu" does not have `rails-3-1` branch.
There are merge conflicts
The comparison view may be inaccurate due to merge conflicts.
Resolve these conflicts or ask someone with write access to this repository to merge it locally.
+ 1
- 1