./config nexus-s failure

gistfile1.txt

error: frameworks/base/: prior sync failed; rebase still in progress
project external/bluetooth/bluez/
First, rewinding head to replay your work on top of it...
Applying: B2G Adaptations
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging src/adapter.c
CONFLICT (content): Merge conflict in src/adapter.c
Recorded preimage for 'src/adapter.c'
Failed to merge in the changes.
Patch failed at 0001 B2G Adaptations

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".


Repo sync failed